- Olena-patches

olena-2.0-105-g83fe5f7 Fix a bug in a tutorial example.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

* doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw, * doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw: Update. * doc/examples/tuto4_genericity_and_algorithms.cc: Include last column and last row in computation. --- milena/ChangeLog | 10 ++++++++++ .../split/tuto4_genericity_and_algorithms-4.cc.raw | 4 ++-- .../split/tuto4_genericity_and_algorithms-5.cc.raw | 4 ++-- .../examples/tuto4_genericity_and_algorithms.cc | 8 ++++---- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 32b7764..4a14115 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix a bug in a tutorial example. + + * doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw, + * doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw: Update. + + * doc/examples/tuto4_genericity_and_algorithms.cc: Include last + column and last row in computation. + 2012-02-28 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/Makefile.am: Disable the use of installdox and fix doc diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw b/milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw index 888c001..5471c2f 100644 --- a/milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw +++ b/milena/doc/examples/split/tuto4_genericity_and_algorithms-4.cc.raw @@ -1,5 +1,5 @@ p_array<point2d> arr; - for (def::coord row = geom::min_row(lena); row < geom::max_row(lena); ++row) - for (def::coord col = geom::min_row(lena); col < geom::max_col(lena); ++col) + for (def::coord row = geom::min_row(lena); row <= geom::max_row(lena); ++row) + for (def::coord col = geom::min_row(lena); col <= geom::max_col(lena); ++col) if (((row + col) % 2) == 0) arr.append(point2d(row, col)); diff --git a/milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw b/milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw index 6a17639..e8822f1 100644 --- a/milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw +++ b/milena/doc/examples/split/tuto4_genericity_and_algorithms-5.cc.raw @@ -1,4 +1,4 @@ - for (def::coord row = geom::min_row(lena); row < geom::max_row(lena); ++row) - for (def::coord col = geom::min_row(lena); col < geom::max_col(lena); ++col) + for (def::coord row = geom::min_row(lena); row <= geom::max_row(lena); ++row) + for (def::coord col = geom::min_row(lena); col <= geom::max_col(lena); ++col) if (((row + col) % 2) == 0) opt::at(lena, row, col) = literal::green; diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index 5639e84..16def80 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -95,14 +95,14 @@ int main() lena = duplicate(lena_bak); // \{ p_array<point2d> arr; - for (def::coord row = geom::min_row(lena); row < geom::max_row(lena); ++row) - for (def::coord col = geom::min_row(lena); col < geom::max_col(lena); ++col) + for (def::coord row = geom::min_row(lena); row <= geom::max_row(lena); ++row) + for (def::coord col = geom::min_row(lena); col <= geom::max_col(lena); ++col) if (((row + col) % 2) == 0) arr.append(point2d(row, col)); // \} // \{ - for (def::coord row = geom::min_row(lena); row < geom::max_row(lena); ++row) - for (def::coord col = geom::min_row(lena); col < geom::max_col(lena); ++col) + for (def::coord row = geom::min_row(lena); row <= geom::max_row(lena); ++row) + for (def::coord col = geom::min_row(lena); col <= geom::max_col(lena); ++col) if (((row + col) % 2) == 0) opt::at(lena, row, col) = literal::green; // \} -- 1.7.2.5

1 0

olena-2.0-106-gde2cb23 doc/tutorial.tex: Add section about multifile compilation.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- milena/ChangeLog | 4 + milena/doc/tutorial.tex | 159 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 138 insertions(+), 25 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4a14115..ce8608c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2012-06-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/tutorial.tex: Add section about multifile compilation. + 2012-05-23 Guillaume Lazzara <z(a)lrde.epita.fr> Fix a bug in a tutorial example. diff --git a/milena/doc/tutorial.tex b/milena/doc/tutorial.tex index 8fee888..e67a9da 100644 --- a/milena/doc/tutorial.tex +++ b/milena/doc/tutorial.tex @@ -952,34 +952,141 @@ result. \doxysubsection{tuto3howtocompile}{Include path} -If Milena has been installed in a custom directory, e.g. not /usr/include or -/usr/local/include, the path to the library headers must be passed to the -compiler. +If Milena has been installed in a custom directory, e.g. not +/usr/include or /usr/local/include, the path to the library headers +must be passed to the compiler. With g++ and MinGW, the option is \B{-I$<$path$>$}. \begin{verbatim} $ g++ -Ipath/to/mln my_program.cc \end{verbatim} -For other compilers, please look at the documentation and search for ``include -path''. - +For other compilers, please look at the documentation and search for +``include path''. \doxysubsection{tuto3liblink}{Library linking} -As it is usually expected when using a library, no library linking is needed for -the library itself. -Milena is a ``header only'' library and is compiled ``on demand'' with your -program. +As it is usually expected when using a library, no library linking is +needed for the library itself. Milena is a ``header only'' library +and is compiled ``on demand'' with your program. + +If you use specific input/output you may need to link your program +with the right graphic library. For more information, please refer to +section \doxyref{inputoutput} in the Quick Reference Guide. + + +\doxysubsection{tuto3multifile}{Multifile Compilation} + +In some cases, one might want to use Olena in a more complex program +compiled through several independant files. + +Let's consider the program is composed of two files both including +Milena headers: +\begin{itemize} + \item main.cc + \item task.cc +\end{itemize} + +Content of main.cc +\begin{verbatim} +#include <mln/core/image/image2d.hh> + +// Main.cc -If you use specific input/output you may need to link your program with the -right graphic library. For more information, please refer to section -\doxyref{inputoutput} in the Quick Reference Guide. +// Forward declaration. +void f(); + +int main() +{ + mln::image2d<int> ima; +} +\end{verbatim} + +Content of task.cc +\begin{verbatim} +#include <mln/core/image/image2d.hh> + +// task.cc + +void f() +{ + mln::image2d<int> ima; +} + +\end{verbatim} + +The following call to the compiler will fail: +\begin{verbatim} +$ g++ -Ipath/to/mln main.cc task.cc +/tmp/ccRaVKO2.o:(.data+0x0): multiple definition of `mln::trace::quiet' +/tmp/ccAArtQl.o:(.data+0x0): first defined here +/tmp/ccRaVKO2.o:(.bss+0x0): multiple definition of `mln::trace::tab' +/tmp/ccAArtQl.o:(.bss+0x0): first defined here +/tmp/ccRaVKO2.o:(.bss+0x4): multiple definition of `mln::trace::full_trace' +/tmp/ccAArtQl.o:(.bss+0x4): first defined here +/tmp/ccRaVKO2.o:(.bss+0x8): multiple definition of `mln::trace::internal::max_tab' +[...] +collect2: ld returned 1 exit status +\end{verbatim} + +This issue is due to the ``header only'' architecture of the library +and to global variables. global variable symbols are compiled for each +files and it leads to symbols conflicts. + +The solution is to force the compiler to compile these symbols only +once. Olena provided a mechanism to do this. + +In one of the files including olena headers, at the very top of +the file (before any includes), add the following line: +\begin{verbatim} +#undef MLN_WO_GLOBAL_VARS +\end{verbatim} + +For instance, we would have in main.cc: +\begin{verbatim} +#undef MLN_WO_GLOBAL_VARS +#include <mln/core/image/image2d.hh> + +// Main.cc + +// Forward declaration. +void f(); + +int main() +{ + f(); +} + +\end{verbatim} + +The compile the sources again with the define: +\begin{verbatim} +$ g++ -DMLN_WO_GLOBAL_VARS -Ipath/to/mln main.cc task.cc +\end{verbatim} + +The previous duplicate symbols will then be compiled thanks to main.cc +which force the effective declaration of the global symbols. Because +of the default define at compile time, any .cc files including headers +from the library will just declare but not define global symbols. + +For that reason, sometimes one may also encounter the following error +after defining MLN\_WO\_GLOBAL\_VARS. +\begin{verbatim} +g++ -DMLN_WO_GLOBAL_VARS -I$PWD/milena/ main.cc task.cc +/tmp/cc4Ys1xX.o: In function `f()': +task.cc:(.text+0x6): undefined reference to `mln::border::thickness' +collect2: ld returned 1 exit status +\end{verbatim} +In our case, it would be because task.cc includes and uses global +symbols which are not included in main.cc. Therefore, they are defined +but never compiled. Here, the file main.cc should include the +corresponding headers. \doxysubsection{tuto3compildndebug}{Disable Debug} -By default, Olena enables a lot of internal pre and post conditions. Usually, -this is a useful feature and it should be enabled. It can heavily slow down a -program though and these tests can be disabled by compiling using -DNDEBUG: +By default, Olena enables a lot of internal pre and post +conditions. Usually, this is a useful feature and it should be +enabled. It can heavily slow down a program though and these tests can +be disabled by compiling using -DNDEBUG: \begin{verbatim} $ g++ -DNDEBUG -Ipath/to/mln my_program.cc @@ -987,20 +1094,22 @@ $ g++ -DNDEBUG -Ipath/to/mln my_program.cc \doxysubsection{tuto3compoptimflags}{Compiler optimization flags} -In this section you will find remarks about the compiler optimization flags and -their impact on the compilation and execution time. +In this section you will find remarks about the compiler optimization +flags and their impact on the compilation and execution time. \doxysubsubsection{tuto3compoptimgcc}{GCC} \begin{itemize} - \item \B{-O0}, combined with -DNDEBUG, it leads to the fastest compilation - time. The execution is somewhat slow though since dispatch functions and one - line members are not inlined by the compiler. - \item \B{-O1}, best compromise between compilation time and execution time. - \item \B{-O2}, \B{-O3}, combined with -DNDEBUG, it leads to the best execution - time. However these optimizations dramatically slow down the compilation and - requires much more memory at compile time. + \item \B{-O0}, combined with -DNDEBUG, it leads to the fastest + compilation time. The execution is somewhat slow though since + dispatch functions and one line members are not inlined by the + compiler. + \item \B{-O1}, best compromise between compilation time and + execution time. + \item \B{-O2}, \B{-O3}, combined with -DNDEBUG, it leads to the best + execution time. However these optimizations dramatically slow down + the compilation and requires much more memory at compile time. \end{itemize} \doxysubsubsection{tuto3compoptimother}{Other compilers} -- 1.7.2.5

1 0

olena-2.0-69-gcf88d22 Rename point_at_index, delta_index and index_of_point.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

* mln/accu/line.hh, * mln/accu/transform_line.hh, * mln/border/duplicate.hh, * mln/border/fill.hh, * mln/convert/to_qimage.hh, * mln/core/concept/doc/image_fastest.hh, * mln/core/concept/window.hh, * mln/core/dpoints_pixter.hh, * mln/core/image/image1d.hh, * mln/core/image/image2d.hh, * mln/core/image/image3d.hh, * mln/core/internal/check/image_fastest.hh, * mln/core/internal/image_identity.hh, * mln/core/internal/pixel_impl.hh, * mln/core/pixel.hh, * mln/data/fill_with_value.spe.hh, * mln/data/memset_.hh, * mln/io/magick/load.hh, * mln/io/magick/save.hh, * mln/labeling/value_and_compute.hh, * mln/linear/gaussian_directional_2d.hh, * mln/subsampling/antialiased.hh, * mln/trait/image/props.hh, * mln/transform/internal/closest_point_functor.hh, * mln/world/binary_2d/subsample.hh: Rename point_at_index, delta_index and index_of_point to point_at_offset, delta_offset and offset_of_point. --- milena/ChangeLog | 32 ++++++++++++++++++ milena/mln/accu/line.hh | 6 ++-- milena/mln/accu/transform_line.hh | 26 +++++++------- milena/mln/border/duplicate.hh | 8 ++-- milena/mln/border/fill.hh | 8 ++-- milena/mln/convert/to_qimage.hh | 9 +++-- milena/mln/core/concept/doc/image_fastest.hh | 9 +++-- milena/mln/core/concept/window.hh | 6 ++-- milena/mln/core/dpoints_pixter.hh | 8 ++-- milena/mln/core/image/image1d.hh | 34 ++++++++++---------- milena/mln/core/image/image2d.hh | 27 +++++++--------- milena/mln/core/image/image3d.hh | 16 +++++----- milena/mln/core/internal/check/image_fastest.hh | 20 ++++++------ milena/mln/core/internal/image_identity.hh | 11 +++--- milena/mln/core/internal/pixel_impl.hh | 6 ++-- milena/mln/core/pixel.hh | 5 ++- milena/mln/data/fill_with_value.spe.hh | 5 ++- milena/mln/data/memset_.hh | 4 +- milena/mln/io/magick/load.hh | 6 ++-- milena/mln/io/magick/save.hh | 6 ++-- milena/mln/labeling/value_and_compute.hh | 2 +- milena/mln/linear/gaussian_directional_2d.hh | 9 +++-- milena/mln/subsampling/antialiased.hh | 8 ++-- milena/mln/trait/image/props.hh | 11 +++--- .../transform/internal/closest_point_functor.hh | 5 ++- milena/mln/world/binary_2d/subsample.hh | 6 ++-- 26 files changed, 165 insertions(+), 128 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 96019b5..f610a5e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,35 @@ +2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Rename point_at_index, delta_index and index_of_point. + + * mln/accu/line.hh, + * mln/accu/transform_line.hh, + * mln/border/duplicate.hh, + * mln/border/fill.hh, + * mln/convert/to_qimage.hh, + * mln/core/concept/doc/image_fastest.hh, + * mln/core/concept/window.hh, + * mln/core/dpoints_pixter.hh, + * mln/core/image/image1d.hh, + * mln/core/image/image2d.hh, + * mln/core/image/image3d.hh, + * mln/core/internal/check/image_fastest.hh, + * mln/core/internal/image_identity.hh, + * mln/core/internal/pixel_impl.hh, + * mln/core/pixel.hh, + * mln/data/fill_with_value.spe.hh, + * mln/data/memset_.hh, + * mln/io/magick/load.hh, + * mln/io/magick/save.hh, + * mln/labeling/value_and_compute.hh, + * mln/linear/gaussian_directional_2d.hh, + * mln/subsampling/antialiased.hh, + * mln/trait/image/props.hh, + * mln/transform/internal/closest_point_functor.hh, + * mln/world/binary_2d/subsample.hh: Rename point_at_index, + delta_index and index_of_point to point_at_offset, delta_offset + and offset_of_point. + 2012-05-10 Guillaume Lazzara <z(a)lrde.epita.fr> Rely on Argument-Dependent Lookup (ADL) in from_to_ overloads. diff --git a/milena/mln/accu/line.hh b/milena/mln/accu/line.hh index 75be6b3..4ae2867 100644 --- a/milena/mln/accu/line.hh +++ b/milena/mln/accu/line.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -240,7 +240,7 @@ namespace mln mln_delta(P) dp = literal::zero; dp[Dir] = 1; - unsigned offset = input.delta_index(dp); + unsigned offset = input.delta_offset(dp); A a; // Accumulator. a.init(); diff --git a/milena/mln/accu/transform_line.hh b/milena/mln/accu/transform_line.hh index 67d97f9..2250c87 100644 --- a/milena/mln/accu/transform_line.hh +++ b/milena/mln/accu/transform_line.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -230,18 +230,18 @@ namespace mln P p = pmin; // Starting point. def::coord& p_dir = p[dir]; - + // Step. mln_delta(P) dp(literal::zero); dp[dir] = 1; - int step = input.delta_index(dp); + int step = input.delta_offset(dp); do { // Start the line. // --------------- - unsigned o_p = input.index_of_point(p); + unsigned o_p = input.offset_of_point(p); unsigned o_qt = o_p - (length / 2) * step; unsigned o_qu = o_qt; a.init(); @@ -293,7 +293,7 @@ namespace mln } } while (p != pmin); - + trace::exiting("accu::impl::transform_line_fastest"); return output; } @@ -331,17 +331,17 @@ namespace mln // Step. mln_delta(P) dp(literal::zero); dp[dir] = 1; - int step = input.delta_index(dp); + int step = input.delta_offset(dp); do { // Start the line. // --------------- - unsigned o_p = input.index_of_point(p); + unsigned o_p = input.offset_of_point(p); unsigned o_qt = o_p; unsigned o_qu = o_p; - + a.init(); // Causal part. @@ -363,7 +363,7 @@ namespace mln { a.take(input.element(o_qt)); o_qt += step; - + ++p_dir; o_p += step; output.element(o_p) = a.to_result(); @@ -397,7 +397,7 @@ namespace mln { a.untake(input.element(o_qu)); o_qu += step; - + o_p += step; output.element(o_p) = a.to_result(); } @@ -420,7 +420,7 @@ namespace mln } } while (p != pmin); - + trace::exiting("accu::impl::transform_line_fastest_without_border"); return output; } @@ -534,7 +534,7 @@ namespace mln A_ a_ = accu::unmeta(exact(a), mln_value(I)()); internal::transform_line_tests(a_, input); - + mln_ch_value(I, mln_result(A_)) output; output = internal::transform_line_dispatch(a_, input, length, dir); diff --git a/milena/mln/border/duplicate.hh b/milena/mln/border/duplicate.hh index 059dc77..cbf8688 100644 --- a/milena/mln/border/duplicate.hh +++ b/milena/mln/border/duplicate.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -101,7 +101,7 @@ namespace mln // Duplicate for_all (pl) { - st = ima.index_of_point (pl); + st = ima.offset_of_point (pl); for (unsigned i = 1; i <= border; ++i) opt::element(ima, st - i) = opt::element(ima, st); st = st + len_c - 1; @@ -152,7 +152,7 @@ namespace mln // Duplicate for (unsigned j = 0; j < len_r; ++j) { - st = ima.index_of_point (pl); + st = ima.offset_of_point (pl); for (unsigned i = 1; i <= border; ++i) opt::element(ima, st - i) = opt::element(ima, st); st = st + len_c - 1; diff --git a/milena/mln/border/fill.hh b/milena/mln/border/fill.hh index 5c04121..6a3ebab 100644 --- a/milena/mln/border/fill.hh +++ b/milena/mln/border/fill.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -97,7 +97,7 @@ namespace mln for_all (pl) { - unsigned end = ima.index_of_point (pl); + unsigned end = ima.offset_of_point (pl); if (st < end) std::memset((void*)&opt::element(ima, st), *(const int*)(&v), @@ -129,7 +129,7 @@ namespace mln for_all (pl) { - unsigned end = ima.index_of_point (pl); + unsigned end = ima.offset_of_point (pl); for (unsigned i = st; i < end; ++i) opt::element(ima, i) = v; st = end + len_r; diff --git a/milena/mln/convert/to_qimage.hh b/milena/mln/convert/to_qimage.hh index a7c8512..f993fbc 100755 --- a/milena/mln/convert/to_qimage.hh +++ b/milena/mln/convert/to_qimage.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -97,7 +98,7 @@ namespace mln # endif // ! QT_VERSION const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); - unsigned offset = ima.delta_index(dpoint2d(+1, - ncols)); + unsigned offset = ima.delta_offset(dpoint2d(+1, - ncols)); // Data is stored as ABGR so we skip the first value which is ignored. for (unsigned row = 0; row < nrows; ++row, ptr_ima += offset) @@ -137,7 +138,7 @@ namespace mln QImage qima(ncols, nrows, QImage::Format_RGB32); uchar * ptr_qima = qima.scanLine(0); const mln_value(I)* ptr_ima = &ima(ima.domain().pmin()); - unsigned offset = ima.delta_index(dpoint2d(+1, - ncols)); + unsigned offset = ima.delta_offset(dpoint2d(+1, - ncols)); for (unsigned row = 0; row < nrows; ++row, ptr_ima += offset) { @@ -183,7 +184,7 @@ namespace mln mln::border::resize(ima, 0); unsigned - offset = ima.delta_index(DP(+1, 0)), + offset = ima.delta_offset(DP(+1, 0)), line_offset = 0; QImage qima(ncols, nrows, QImage::Format_RGB888); diff --git a/milena/mln/core/concept/doc/image_fastest.hh b/milena/mln/core/concept/doc/image_fastest.hh index b3ecedc..5474f9d 100644 --- a/milena/mln/core/concept/doc/image_fastest.hh +++ b/milena/mln/core/concept/doc/image_fastest.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,7 +50,7 @@ namespace mln * * \pre The image has to be initialized. */ - int delta_index(const dpoint& dp); + int delta_offset(const dpoint& dp); /*! \brief Give the point at offset \p o. @@ -59,12 +60,12 @@ namespace mln * \pre The image has to be initialized. * \pre o < nelements() */ - point point_at_index(unsigned o) const; + point point_at_offset(unsigned o) const; /*! \brief Give a hook to the value buffer. * - * + * * * \pre The image has to be initialized. */ diff --git a/milena/mln/core/concept/window.hh b/milena/mln/core/concept/window.hh index 9aa58bd..c59924f 100644 --- a/milena/mln/core/concept/window.hh +++ b/milena/mln/core/concept/window.hh @@ -357,7 +357,7 @@ namespace mln unsigned n = win.size(); for (unsigned i = 0; i < n; ++i) - arr.append(ima.delta_index(win.dp(i))); + arr.append(ima.delta_offset(win.dp(i))); return arr; } @@ -380,7 +380,7 @@ namespace mln for (unsigned i = 0; i < n; ++i) { - int offset = ima.delta_index(win.dp(i)); + int offset = ima.delta_offset(win.dp(i)); if (offset > 0) arr.append(offset); } @@ -406,7 +406,7 @@ namespace mln for (unsigned i = 0; i < n; ++i) { - int offset = ima.delta_index(win.dp(i)); + int offset = ima.delta_offset(win.dp(i)); if (offset < 0) arr.append(offset); } diff --git a/milena/mln/core/dpoints_pixter.hh b/milena/mln/core/dpoints_pixter.hh index eb19c2b..aeea333 100644 --- a/milena/mln/core/dpoints_pixter.hh +++ b/milena/mln/core/dpoints_pixter.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -270,7 +270,7 @@ namespace mln dpoints_fwd_pixter<I>::init_(const Dps& dps) { for (unsigned i = 0; i < dps.size(); ++i) - offset_.push_back(this->image_.delta_index(dps.dp(i))); + offset_.push_back(this->image_.delta_offset(dps.dp(i))); // offset_[0] is absolute // other offsets are relative: if (dps.size() > 1) @@ -381,7 +381,7 @@ namespace mln dpoints_bkd_pixter<I>::init_(const Dps& dps) { for (unsigned i = 0; i < dps.size(); ++i) - offset_.push_back(this->image_.delta_index(dps.dp(i))); + offset_.push_back(this->image_.delta_offset(dps.dp(i))); // offset_[size() - 1] is absolute // other offsets are relative: if (dps.size() > 1) diff --git a/milena/mln/core/image/image1d.hh b/milena/mln/core/image/image1d.hh index 53e8611..60f828d 100644 --- a/milena/mln/core/image/image1d.hh +++ b/milena/mln/core/image/image1d.hh @@ -189,27 +189,27 @@ namespace mln // Specific methods: // ----------------- - /// Read-only access to the image value located at (\p index). - const T& at_(def::coord index) const; + /// Read-only access to the image value located at (\p offset). + const T& at_(def::coord offset) const; - /// Read-write access to the image value located at (\p index). - T& at_(def::coord index); + /// Read-write access to the image value located at (\p offset). + T& at_(def::coord offset); - /// Give the number of indexes. + /// Give the number of offsets. unsigned ninds() const; /// Fast Image method - // Give the index of a point. - using super_::index_of_point; + // Give the offset of a point. + using super_::offset_of_point; /// Give the offset corresponding to the delta-point \p dp. - int delta_index(const dpoint1d& dp) const; + int delta_offset(const dpoint1d& dp) const; /// Give the point corresponding to the offset \p o. - point1d point_at_index(unsigned i) const; + point1d point_at_offset(unsigned i) const; /// Give a hook to the value buffer. const T* buffer() const; @@ -450,10 +450,10 @@ namespace mln template <typename T> inline const T& - image1d<T>::at_(def::coord index) const + image1d<T>::at_(def::coord offset) const { - mln_precondition(this->has(point1d(index))); - return this->data_->array_[index]; + mln_precondition(this->has(point1d(offset))); + return this->data_->array_[offset]; } template <typename T> @@ -468,10 +468,10 @@ namespace mln template <typename T> inline T& - image1d<T>::at_(def::coord index) + image1d<T>::at_(def::coord offset) { - mln_precondition(this->has(point1d(index))); - return this->data_->array_[index]; + mln_precondition(this->has(point1d(offset))); + return this->data_->array_[offset]; } @@ -514,7 +514,7 @@ namespace mln template <typename T> inline int - image1d<T>::delta_index(const dpoint1d& dp) const + image1d<T>::delta_offset(const dpoint1d& dp) const { mln_precondition(this->is_valid()); int o = dp[0]; @@ -524,7 +524,7 @@ namespace mln template <typename T> inline point1d - image1d<T>::point_at_index(unsigned i) const + image1d<T>::point_at_offset(unsigned i) const { mln_precondition(i < nelements()); def::coord ind = static_cast<def::coord>(i + this->data_->vb_.min_ind()); diff --git a/milena/mln/core/image/image2d.hh b/milena/mln/core/image/image2d.hh index bc49561..213c7c9 100644 --- a/milena/mln/core/image/image2d.hh +++ b/milena/mln/core/image/image2d.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -31,9 +31,6 @@ /// Definition of the basic mln::image2d class. /// /// \todo Re-activate include at EOF when make::image2d is up again. -/// -/// \todo Rename delta_index and point_at_index as offset and -/// point_at_offset. # include <mln/core/internal/image_primary.hh> # include <mln/core/internal/fixme.hh> @@ -226,8 +223,8 @@ namespace mln // As a fastest image: // ------------------- - // Give the index of a point. - using super_::index_of_point; + // Give the offset of a point. + using super_::offset_of_point; /// Give the border thickness. unsigned border() const; @@ -235,17 +232,17 @@ namespace mln /// Give the number of elements (points including border ones). unsigned nelements() const; - /// Read-only access to the image value located at index \p i. + /// Read-only access to the image value located at offset \p i. const T& element(unsigned i) const; - /// Read-write access to the image value located at index \p i. + /// Read-write access to the image value located at offset \p i. T& element(unsigned i); - /// Give the delta-index corresponding to the delta-point \p dp. - int delta_index(const dpoint2d& dp) const; + /// Give the delta-offset corresponding to the delta-point \p dp. + int delta_offset(const dpoint2d& dp) const; - /// Give the point corresponding to the index \p i. - point2d point_at_index(unsigned i) const; + /// Give the point corresponding to the offset \p i. + point2d point_at_offset(unsigned i) const; /// Give a hook to the value buffer. const T* buffer() const; @@ -571,7 +568,7 @@ namespace mln template <typename T> inline int - image2d<T>::delta_index(const dpoint2d& dp) const + image2d<T>::delta_offset(const dpoint2d& dp) const { mln_precondition(this->is_valid()); int o = dp[0] * this->data_->vb_.len(1) + dp[1]; @@ -581,7 +578,7 @@ namespace mln template <typename T> inline point2d - image2d<T>::point_at_index(unsigned i) const + image2d<T>::point_at_offset(unsigned i) const { mln_precondition(i < nelements()); def::coord diff --git a/milena/mln/core/image/image3d.hh b/milena/mln/core/image/image3d.hh index 59d6908..9a4fabf 100644 --- a/milena/mln/core/image/image3d.hh +++ b/milena/mln/core/image/image3d.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009, 2010, 2011 EPITA Research and +// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 EPITA Research and // Development Laboratory (LRDE) // // This file is part of Olena. @@ -163,7 +163,7 @@ namespace mln /// 3). image3d(const box3d& b, unsigned bdr = border::thickness); - /// Constructor with the numbers of indexes and the + /// Constructor with the numbers of offsets and the /// border thickness. image3d(int nslis, int nrows, int ncols, unsigned bdr = border::thickness); @@ -196,10 +196,10 @@ namespace mln /// Read-write access to the image value located at point \p p. T& operator()(const point3d& p); - /// Read-only access to the image value located at index \p i. + /// Read-only access to the image value located at offset \p i. const T& element(unsigned i) const; - /// Read-write access to the image value located at index \p i. + /// Read-write access to the image value located at offset \p i. T& element(unsigned i); /// Read-only access to the image value located at (\p sli, \p @@ -224,10 +224,10 @@ namespace mln /// Fast Image method /// Give the offset corresponding to the delta-point \p dp. - int delta_index(const dpoint3d& dp) const; + int delta_offset(const dpoint3d& dp) const; /// Give the point corresponding to the offset \p o. - point3d point_at_index(unsigned o) const; + point3d point_at_offset(unsigned o) const; /// Give a hook to the value buffer. const T* buffer() const; @@ -569,7 +569,7 @@ namespace mln template <typename T> inline int - image3d<T>::delta_index(const dpoint3d& dp) const + image3d<T>::delta_offset(const dpoint3d& dp) const { mln_precondition(this->is_valid()); int o = (dp[0] * this->data_->vb_.len(1) @@ -580,7 +580,7 @@ namespace mln template <typename T> inline point3d - image3d<T>::point_at_index(unsigned o) const + image3d<T>::point_at_offset(unsigned o) const { mln_precondition(o < nelements()); def::coord diff --git a/milena/mln/core/internal/check/image_fastest.hh b/milena/mln/core/internal/check/image_fastest.hh index 9aa7c51..95ab8a9 100644 --- a/milena/mln/core/internal/check/image_fastest.hh +++ b/milena/mln/core/internal/check/image_fastest.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2011 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2011, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -32,7 +32,7 @@ /// \brief Class that statically checks the interface of fastest /// images. /// -/// \todo Check and convert p in index_of_point towards E::psite. +/// \todo Check and convert p in offset_of_point towards E::psite. # include <mln/metal/bool.hh> # include <mln/core/macros.hh> @@ -62,11 +62,11 @@ namespace mln /// \warning This method is final. /// /// \pre The image has to be initialized and to own the point \p p. - /// \post p == point_at_index(result) + /// \post p == point_at_offset(result) /// template <typename P> unsigned - index_of_point(const P& p) const; + offset_of_point(const P& p) const; protected: image_fastest_(); @@ -94,9 +94,9 @@ namespace mln typedef mln_fwd_pixter(E) fwd_pixter; typedef mln_bkd_pixter(E) bkd_pixter; - int (E::*m1)(const dpsite&) const = & E::delta_index; + int (E::*m1)(const dpsite&) const = & E::delta_offset; (void) m1; - site (E::*m2)(unsigned) const = & E::point_at_index; + site (E::*m2)(unsigned) const = & E::point_at_offset; (void) m2; unsigned (E::*m3)() const = & E::border; (void) m3; @@ -120,7 +120,7 @@ namespace mln (void) m8; # if (defined(__GNUC__) && __GNUC__ >= 3) && !defined(__INTEL_COMPILER) - unsigned (E::*m9)(const psite& p) const = & E::index_of_point; + unsigned (E::*m9)(const psite& p) const = & E::offset_of_point; (void) m9; # endif @@ -131,14 +131,14 @@ namespace mln template <typename P> inline unsigned - image_fastest_<E,B>::index_of_point(const P& p) const + image_fastest_<E,B>::offset_of_point(const P& p) const { const E* this_ = & internal::force_exact<E>(*this); mln_precondition(this_->is_valid()); mln_precondition(this_->has(p)); unsigned i = & this_->operator()(p) - this_->buffer(); - mln_postcondition(p == this_->point_at_index(i)); + mln_postcondition(p == this_->point_at_offset(i)); return i; } diff --git a/milena/mln/core/internal/image_identity.hh b/milena/mln/core/internal/image_identity.hh index 239ffbf..25e8b3a 100644 --- a/milena/mln/core/internal/image_identity.hh +++ b/milena/mln/core/internal/image_identity.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -68,14 +69,14 @@ namespace mln public: - int delta_index(const mln_deduce(I, psite, delta)& dp) const + int delta_offset(const mln_deduce(I, psite, delta)& dp) const { - return del_().delta_index(dp); + return del_().delta_offset(dp); } - mln_site(I) point_at_index(unsigned i) const + mln_site(I) point_at_offset(unsigned i) const { - return del_().point_at_index(i); + return del_().point_at_offset(i); } unsigned border() const diff --git a/milena/mln/core/internal/pixel_impl.hh b/milena/mln/core/internal/pixel_impl.hh index d0549b1..a07f677 100644 --- a/milena/mln/core/internal/pixel_impl.hh +++ b/milena/mln/core/internal/pixel_impl.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010, 2012 EPITA Research and +// Development Laboratory (LRDE) // // This file is part of Olena. // @@ -95,7 +95,7 @@ namespace mln operator util::pix<unconst_image_t>() const { - util::pix<unconst_image_t> tmp(image_, image_.point_at_index(offset())); + util::pix<unconst_image_t> tmp(image_, image_.point_at_offset(offset())); return tmp; } diff --git a/milena/mln/core/pixel.hh b/milena/mln/core/pixel.hh index be6cea4..1ae5781 100644 --- a/milena/mln/core/pixel.hh +++ b/milena/mln/core/pixel.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -103,7 +104,7 @@ namespace mln if (this->value_ptr_ == 0 || ! this->image_.is_valid()) return false; int o = this->value_ptr_ - this->image_.buffer(); - mln_psite(I) p = this->image_.point_at_index(o); + mln_psite(I) p = this->image_.point_at_offset(o); return this->image_.has(p); } diff --git a/milena/mln/data/fill_with_value.spe.hh b/milena/mln/data/fill_with_value.spe.hh index 3f1478a..d7c9557 100644 --- a/milena/mln/data/fill_with_value.spe.hh +++ b/milena/mln/data/fill_with_value.spe.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -88,7 +89,7 @@ namespace mln trait::image::value_access::direct))::check(); mln_value(I) v = static_cast<mln_value(I)>(val); - data::memset_(ima, ima.point_at_index(0), v, opt::nelements(ima)); + data::memset_(ima, ima.point_at_offset(0), v, opt::nelements(ima)); trace::exiting("data::impl::fill_with_value_one_block"); } diff --git a/milena/mln/data/memset_.hh b/milena/mln/data/memset_.hh index 42b1412..a7484b5 100644 --- a/milena/mln/data/memset_.hh +++ b/milena/mln/data/memset_.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -160,7 +160,7 @@ namespace mln mln_precondition(input.is_valid()); mln_precondition(input.has(p)); - mln_precondition(input.index_of_point(p) + n <= opt::nelements(input)); + mln_precondition(input.offset_of_point(p) + n <= opt::nelements(input)); pixel<I> pix(input, p); impl::memset__(pix, v, n); diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index 2acd668..33a42f0 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -166,7 +166,7 @@ namespace mln Magick::PixelPacket* pixels = view.get(0, 0, ima.ncols(), ima.nrows()); mln_value(I) *ptr_ima = &ima(ima.domain().pmin()); - unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + unsigned row_offset = ima.delta_offset(dpoint2d(+1, - ncols)); for (def::coord row = minrow; row <= maxrow; ++row, ptr_ima += row_offset) diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index 80b20df..252ace8 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -239,7 +239,7 @@ namespace mln Magick::PixelPacket* pixels = view.get(0, 0, ncols, nrows); const mln_value(I) *ptr_ima = &ima(ima.domain().pmin()); - unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); + unsigned row_offset = ima.delta_offset(dpoint2d(+1, - ncols)); for (def::coord row = minrow; row <= maxrow; ++row, ptr_ima += row_offset) @@ -302,8 +302,8 @@ namespace mln const mln_value(I) *ptr_ima = &ima(ima.domain().pmin()); const mln_value(J) *ptr_opacity_mask = &opacity_mask(opacity_mask.domain().pmin()); - unsigned row_offset = ima.delta_index(dpoint2d(+1, - ncols)); - unsigned opacity_row_offset = opacity_mask.delta_index(dpoint2d(+1, - ncols)); + unsigned row_offset = ima.delta_offset(dpoint2d(+1, - ncols)); + unsigned opacity_row_offset = opacity_mask.delta_offset(dpoint2d(+1, - ncols)); for (def::coord row = minrow; row <= maxrow; ++row, ptr_ima += row_offset, diff --git a/milena/mln/labeling/value_and_compute.hh b/milena/mln/labeling/value_and_compute.hh index e82d8f4..e741790 100644 --- a/milena/mln/labeling/value_and_compute.hh +++ b/milena/mln/labeling/value_and_compute.hh @@ -175,7 +175,7 @@ namespace mln inline void process__(const mln_psite(I)&, unsigned p, const L& l) { - accus_[l].take(input.point_at_index(p)); + accus_[l].take(input.point_at_offset(p)); } diff --git a/milena/mln/linear/gaussian_directional_2d.hh b/milena/mln/linear/gaussian_directional_2d.hh index bda0eda..eb8bc9b 100644 --- a/milena/mln/linear/gaussian_directional_2d.hh +++ b/milena/mln/linear/gaussian_directional_2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -350,9 +351,9 @@ namespace mln std::vector<double> tmp1(len); std::vector<double> tmp2(len); - unsigned delta_offset = ima.delta_index(d); + unsigned delta_offset = ima.delta_offset(d); unsigned - o_start = ima.index_of_point(start), + o_start = ima.offset_of_point(start), o_start_d = o_start + delta_offset, o_start_dd = o_start + 2 * delta_offset, o_start_ddd = o_start + 3 * delta_offset; @@ -407,7 +408,7 @@ namespace mln // extension::fill(ima, bdr); unsigned - o_finish = ima.index_of_point(finish), + o_finish = ima.offset_of_point(finish), o_finish_d = o_finish - delta_offset, o_finish_dd = o_finish - 2 * delta_offset; diff --git a/milena/mln/subsampling/antialiased.hh b/milena/mln/subsampling/antialiased.hh index 66bdd33..09caeb7 100644 --- a/milena/mln/subsampling/antialiased.hh +++ b/milena/mln/subsampling/antialiased.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -187,7 +187,7 @@ namespace mln const unsigned factor_2 = factor * factor, factor_round = factor_2 / 2; - unsigned offset = input.delta_index(point2d(factor,0) - point2d(0,factor*n)); + unsigned offset = input.delta_offset(point2d(factor,0) - point2d(0,factor*n)); for_all(s) { @@ -267,7 +267,7 @@ namespace mln const unsigned factor_2 = factor * factor, factor_round = factor_2 / 2; - unsigned offset = input.delta_index(point2d(factor,0) - point2d(0,factor*n)); + unsigned offset = input.delta_offset(point2d(factor,0) - point2d(0,factor*n)); for_all(s) { diff --git a/milena/mln/trait/image/props.hh b/milena/mln/trait/image/props.hh index c7b7746..2726814 100644 --- a/milena/mln/trait/image/props.hh +++ b/milena/mln/trait/image/props.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -152,10 +153,10 @@ // => .value_() : rvalue, returns the flat value // one_block // => .nelements_() : unsigned, number of buffer elements -// => .point_at_index_(unsigned index) : point, -// point corresponding to the index index -// => .delta_index_(deltapoint dp) : unsigned -// Return the delta index associated to dp +// => .point_at_offset_(unsigned offset) : point, +// point corresponding to the offset offset +// => .delta_offset_(deltapoint dp) : unsigned +// Return the delta offset associated to dp // one_block and value_access::direct // => element_(unsigned index) : rvalue, returns the element at index. // => element_(unsigned index) : lvalue, returns the element at index. diff --git a/milena/mln/transform/internal/closest_point_functor.hh b/milena/mln/transform/internal/closest_point_functor.hh index 5302502..e5a18cf 100644 --- a/milena/mln/transform/internal/closest_point_functor.hh +++ b/milena/mln/transform/internal/closest_point_functor.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -273,7 +274,7 @@ namespace mln inline void closest_point_functor_with_sites<I>::init_p_(unsigned p) { - cp_ima.element(p) = cp_ima.point_at_index(p); + cp_ima.element(p) = cp_ima.point_at_offset(p); } template <typename I> diff --git a/milena/mln/world/binary_2d/subsample.hh b/milena/mln/world/binary_2d/subsample.hh index 0d8c557..70c9c9e 100644 --- a/milena/mln/world/binary_2d/subsample.hh +++ b/milena/mln/world/binary_2d/subsample.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2011, 2012 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -94,7 +94,7 @@ namespace mln image2d<int_u8> output(box<point2d>(pmin, pmax)); dpoint2d dp_row(1, 0); - const unsigned delta_row = input.delta_index(dp_row); + const unsigned delta_row = input.delta_offset(dp_row); unsigned count = 0; for (unsigned row = 0; row < nrows; ++row) -- 1.7.2.5

1 0

olena-2.0-70-g378f353 Rename point_at_index, delta_index and index_of_point.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

* scribo/binarization/sauvola_ms.hh, * scribo/canvas/integral_browsing.hh, * scribo/draw/line_components.hh, * scribo/filter/object_groups_with_holes.hh, * scribo/filter/objects_with_holes.hh, * scribo/postprocessing/fill_object_holes.hh, * scribo/preprocessing/rotate_90.hh, * scribo/primitive/extract/internal/union.hh, * scribo/primitive/extract/lines_h_thick_and_thin.hh, * scribo/primitive/extract/lines_pattern.hh, * scribo/primitive/extract/separators_nonvisible.hh, * scribo/primitive/internal/rd.hh, * scribo/subsampling/integral.hh, * scribo/subsampling/integral_single_image.hh, * scribo/text/merging.hh, * scribo/text/merging_hdoc.hh: Rename point_at_index, delta_index and index_of_point to point_at_offset, delta_offset and offset_of_point. --- scribo/ChangeLog | 23 +++++++++++++ scribo/scribo/binarization/sauvola_ms.hh | 34 ++++++++++---------- scribo/scribo/canvas/integral_browsing.hh | 6 ++-- scribo/scribo/draw/line_components.hh | 8 ++-- scribo/scribo/filter/object_groups_with_holes.hh | 2 +- scribo/scribo/filter/objects_with_holes.hh | 2 +- scribo/scribo/postprocessing/fill_object_holes.hh | 2 +- scribo/scribo/preprocessing/rotate_90.hh | 10 +++--- scribo/scribo/primitive/extract/internal/union.hh | 6 ++-- .../primitive/extract/lines_h_thick_and_thin.hh | 8 ++-- scribo/scribo/primitive/extract/lines_pattern.hh | 2 +- .../primitive/extract/separators_nonvisible.hh | 16 +++++----- scribo/scribo/primitive/internal/rd.hh | 2 +- scribo/scribo/subsampling/integral.hh | 8 ++-- scribo/scribo/subsampling/integral_single_image.hh | 8 ++-- scribo/scribo/text/merging.hh | 4 +- scribo/scribo/text/merging_hdoc.hh | 4 +- 17 files changed, 84 insertions(+), 61 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f8d7491..5561f60 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,26 @@ +2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Rename point_at_index, delta_index and index_of_point. + + * scribo/binarization/sauvola_ms.hh, + * scribo/canvas/integral_browsing.hh, + * scribo/draw/line_components.hh, + * scribo/filter/object_groups_with_holes.hh, + * scribo/filter/objects_with_holes.hh, + * scribo/postprocessing/fill_object_holes.hh, + * scribo/preprocessing/rotate_90.hh, + * scribo/primitive/extract/internal/union.hh, + * scribo/primitive/extract/lines_h_thick_and_thin.hh, + * scribo/primitive/extract/lines_pattern.hh, + * scribo/primitive/extract/separators_nonvisible.hh, + * scribo/primitive/internal/rd.hh, + * scribo/subsampling/integral.hh, + * scribo/subsampling/integral_single_image.hh, + * scribo/text/merging.hh, + * scribo/text/merging_hdoc.hh: Rename point_at_index, + delta_index and index_of_point to point_at_offset, delta_offset + and offset_of_point. + 2012-05-10 Guillaume Lazzara <z(a)lrde.epita.fr> Improve option parser. diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 36629f9..6d8ae59 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -305,23 +305,23 @@ namespace scribo nrows4 = t_ima[4].nrows(), ncols4 = t_ima[4].ncols(), - delta1 = in.delta_index(dpoint2d(+1, -(s - 1))), - delta1b = in.delta_index(dpoint2d(+1, -(s + s - 1))), - delta1c = in.delta_index(dpoint2d(-(s + s - 1), +1)), - delta1d = in.delta_index(dpoint2d(+1, -(s * 4 - 1))), - delta1e = in.delta_index(dpoint2d(-(s * 4 - 1), +1)), - delta1f = in.delta_index(dpoint2d(-(s - 1), +1)), - - delta2 = t_ima[2].delta_index(dpoint2d(+1, -1)), - delta2b = t_ima[2].delta_index(dpoint2d(+1, -3)), - delta2c = t_ima[2].delta_index(dpoint2d(-3, +1)), - - delta3 = t_ima[3].delta_index(dpoint2d(+1, -1)), - - eor1 = in.delta_index(dpoint2d(+4 * s, - in.ncols())) + more_offset, - eor2 = t_ima[2].delta_index(dpoint2d(+4,- t_ima[2].ncols())), - eor3 = t_ima[3].delta_index(dpoint2d(+2,- t_ima[3].ncols())), - eor4 = t_ima[4].delta_index(dpoint2d(+1,- t_ima[4].ncols())); + delta1 = in.delta_offset(dpoint2d(+1, -(s - 1))), + delta1b = in.delta_offset(dpoint2d(+1, -(s + s - 1))), + delta1c = in.delta_offset(dpoint2d(-(s + s - 1), +1)), + delta1d = in.delta_offset(dpoint2d(+1, -(s * 4 - 1))), + delta1e = in.delta_offset(dpoint2d(-(s * 4 - 1), +1)), + delta1f = in.delta_offset(dpoint2d(-(s - 1), +1)), + + delta2 = t_ima[2].delta_offset(dpoint2d(+1, -1)), + delta2b = t_ima[2].delta_offset(dpoint2d(+1, -3)), + delta2c = t_ima[2].delta_offset(dpoint2d(-3, +1)), + + delta3 = t_ima[3].delta_offset(dpoint2d(+1, -1)), + + eor1 = in.delta_offset(dpoint2d(+4 * s, - in.ncols())) + more_offset, + eor2 = t_ima[2].delta_offset(dpoint2d(+4,- t_ima[2].ncols())), + eor3 = t_ima[3].delta_offset(dpoint2d(+2,- t_ima[3].ncols())), + eor4 = t_ima[4].delta_offset(dpoint2d(+1,- t_ima[4].ncols())); mln_value(J) threshold; for (int row4 = 0; row4 < nrows4; ++row4) diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index 0ec3d83..f8bf484 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.hh @@ -95,9 +95,9 @@ namespace scribo col_0 = step / 2; const int - offset_down = ima.delta_index(dpoint2d(step, 0)), - offset_ante = ima.delta_index(dpoint2d(0, -w)), - offset_below = ima.delta_index(dpoint2d(+h, 0)); + offset_down = ima.delta_offset(dpoint2d(step, 0)), + offset_ante = ima.delta_offset(dpoint2d(0, -w)), + offset_below = ima.delta_offset(dpoint2d(+h, 0)); const int max_row_top = h/2, diff --git a/scribo/scribo/draw/line_components.hh b/scribo/scribo/draw/line_components.hh index 12e7489..6025eef 100644 --- a/scribo/scribo/draw/line_components.hh +++ b/scribo/scribo/draw/line_components.hh @@ -78,14 +78,14 @@ namespace scribo const mln_value(L) v = c; const box2d& bbox = comp_set(c).bbox(); - const unsigned index = labeled_image.index_of_point(bbox.pmin()); - const unsigned index2 = input.index_of_point(bbox.pmin()); + const unsigned index = labeled_image.offset_of_point(bbox.pmin()); + const unsigned index2 = input.offset_of_point(bbox.pmin()); const mln_value(L)* ptr_in = &(labeled_image.element(index)); mln_value(I)* ptr_out = &(input.element(index2)); const unsigned nrows = bbox.height(); const unsigned ncols = bbox.width(); - const int delta = labeled_image.delta_index(dpoint2d(+1, -ncols)); - const int delta2 = input.delta_index(dpoint2d(+1, -ncols)); + const int delta = labeled_image.delta_offset(dpoint2d(+1, -ncols)); + const int delta2 = input.delta_offset(dpoint2d(+1, -ncols)); for (unsigned k = 0; k < nrows; ++k) { diff --git a/scribo/scribo/filter/object_groups_with_holes.hh b/scribo/scribo/filter/object_groups_with_holes.hh index a59beec..495d97e 100644 --- a/scribo/scribo/filter/object_groups_with_holes.hh +++ b/scribo/scribo/filter/object_groups_with_holes.hh @@ -119,7 +119,7 @@ namespace scribo unsigned nrows = geom::nrows(b), ncols = geom::ncols(b), - row_offset = lbl.delta_index(D(+1, -ncols)); + row_offset = lbl.delta_offset(D(+1, -ncols)); mln_value(L) *ptr = &output(b.pmin()); for (unsigned row = 0; row < nrows; ++row, ptr += row_offset) diff --git a/scribo/scribo/filter/objects_with_holes.hh b/scribo/scribo/filter/objects_with_holes.hh index 09eaad5..1084d87 100644 --- a/scribo/scribo/filter/objects_with_holes.hh +++ b/scribo/scribo/filter/objects_with_holes.hh @@ -135,7 +135,7 @@ namespace scribo unsigned nrows = b.pmax().row() - b.pmin().row() + 1, ncols = b.pmax().col() - b.pmin().col() + 1, - row_offset = lbl.delta_index(D(+1, -ncols)); + row_offset = lbl.delta_offset(D(+1, -ncols)); mln_value(L) *ptr = &output(b.pmin()); for (unsigned row = 0; row < nrows; ++row, ptr += row_offset) diff --git a/scribo/scribo/postprocessing/fill_object_holes.hh b/scribo/scribo/postprocessing/fill_object_holes.hh index ea77fb6..9552d2c 100644 --- a/scribo/scribo/postprocessing/fill_object_holes.hh +++ b/scribo/scribo/postprocessing/fill_object_holes.hh @@ -130,7 +130,7 @@ namespace scribo unsigned nrows = b.pmax().row() - b.pmin().row() + 1, ncols = b.pmax().col() - b.pmin().col() + 1, - row_offset = lbl.delta_index(D(+1, -ncols)); + row_offset = lbl.delta_offset(D(+1, -ncols)); mln_value(L) *ptr = &output(b.pmin()); for (unsigned row = 0; row < nrows; ++row, ptr += row_offset) diff --git a/scribo/scribo/preprocessing/rotate_90.hh b/scribo/scribo/preprocessing/rotate_90.hh index e6d68c8..4411439 100644 --- a/scribo/scribo/preprocessing/rotate_90.hh +++ b/scribo/scribo/preprocessing/rotate_90.hh @@ -122,18 +122,18 @@ namespace scribo if (positive) // +90 deg { dpoint2d dp(out_nrows, + 1); - out_next_offset = output.delta_index(dp); + out_next_offset = output.delta_offset(dp); - out_next_p_offset = output.delta_index(dpoint2d(-1, 0)); + out_next_p_offset = output.delta_offset(dpoint2d(-1, 0)); - out_ptr += output.delta_index(dpoint2d(out_nrows - 1, 0)); + out_ptr += output.delta_offset(dpoint2d(out_nrows - 1, 0)); } else // -90 deg { dpoint2d dp(- out_nrows, - 1); - out_next_offset = output.delta_index(dp); + out_next_offset = output.delta_offset(dp); - out_next_p_offset = output.delta_index(dpoint2d(+1, 0)); + out_next_p_offset = output.delta_offset(dpoint2d(+1, 0)); out_ptr += out_ncols - 1; } diff --git a/scribo/scribo/primitive/extract/internal/union.hh b/scribo/scribo/primitive/extract/internal/union.hh index 509a7e4..89687d6 100644 --- a/scribo/scribo/primitive/extract/internal/union.hh +++ b/scribo/scribo/primitive/extract/internal/union.hh @@ -80,7 +80,7 @@ namespace scribo { const unsigned nrows = input.nrows(), ncols = input.ncols(); - unsigned op, on, delta = input.delta_index(dpoint2d(1, 0)); + unsigned op, on, delta = input.delta_offset(dpoint2d(1, 0)); data::fill(parent, 0); max_area = 0; @@ -89,7 +89,7 @@ namespace scribo // row == 0 and col == 0 - op = input.index_of_point(point2d(0,0)); + op = input.offset_of_point(point2d(0,0)); if (input.element(op) == lab) { area.element(op) = 1; @@ -131,7 +131,7 @@ namespace scribo { // col == 0 - op = input.index_of_point(point2d(row, 0)); + op = input.offset_of_point(point2d(row, 0)); on = op - delta; if (input.element(op) == lab) diff --git a/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh b/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh index 45b2ad3..f169a3e 100644 --- a/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh +++ b/scribo/scribo/primitive/extract/lines_h_thick_and_thin.hh @@ -166,8 +166,8 @@ namespace scribo dpoint2d up(-delta, 0), down(+delta, 0); const int - offset_up = count.delta_index(up), - offset_down = count.delta_index(down); + offset_up = count.delta_offset(up), + offset_down = count.delta_offset(down); typedef const unsigned* ptr_t; value::int_u8* p_out; @@ -238,7 +238,7 @@ namespace scribo // out: int& row, value::int_u8& next_tag) { - int row_offset = input.delta_index(dpoint2d(+1, 0)); + int row_offset = input.delta_offset(dpoint2d(+1, 0)); const value::int_u8* p = & input.at_(row, col); while (*p == tag) { @@ -251,7 +251,7 @@ namespace scribo void draw_vertical(image2d<bool>& output, unsigned col, int row_start, int row_end) { - const unsigned offset = output.delta_index(dpoint2d(+1, 0)); // next row + const unsigned offset = output.delta_offset(dpoint2d(+1, 0)); // next row bool* p_out = & output.at_(row_start, col); for (int row = row_start; row < row_end; ++row, p_out += offset) *p_out = true; diff --git a/scribo/scribo/primitive/extract/lines_pattern.hh b/scribo/scribo/primitive/extract/lines_pattern.hh index ec24d4f..35e4447 100644 --- a/scribo/scribo/primitive/extract/lines_pattern.hh +++ b/scribo/scribo/primitive/extract/lines_pattern.hh @@ -177,7 +177,7 @@ namespace scribo mln_box_runstart_piter(I) p(output.domain()); for_all(p) { - unsigned pi = output.index_of_point(p); + unsigned pi = output.offset_of_point(p); unsigned *tmp_ptr = &tmp.element(pi); unsigned *end_ptr = tmp_ptr + ncols; diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 998d6ec..870804c 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -403,21 +403,21 @@ namespace scribo extension::adjust_fill(tmp, 21, 0); value::int_u8 *sep_lbl_ptr = sep_lbl.buffer() - + sep_lbl.index_of_point(sep_lbl.domain().pmin()); + + sep_lbl.offset_of_point(sep_lbl.domain().pmin()); bool *separators_ptr = separators.buffer() - + separators.index_of_point(separators.domain().pmin()); - unsigned *tmp_ptr = tmp.buffer() + tmp.index_of_point(tmp.domain().pmin());; - int idx1 = tmp.delta_index(dp1); - int idx2 = tmp.delta_index(dp2); + + separators.offset_of_point(separators.domain().pmin()); + unsigned *tmp_ptr = tmp.buffer() + tmp.offset_of_point(tmp.domain().pmin());; + int idx1 = tmp.delta_offset(dp1); + int idx2 = tmp.delta_offset(dp2); unsigned nrows = separators.nrows(), ncols = separators.ncols(); unsigned - row_idx_sep_lbl = sep_lbl.delta_index(dpoint2d(+1, - ncols)), - row_idx_separators = separators.delta_index(dpoint2d(+1, - ncols)), - row_idx_tmp = tmp.delta_index(dpoint2d(+1, - ncols)); + row_idx_sep_lbl = sep_lbl.delta_offset(dpoint2d(+1, - ncols)), + row_idx_separators = separators.delta_offset(dpoint2d(+1, - ncols)), + row_idx_tmp = tmp.delta_offset(dpoint2d(+1, - ncols)); for (unsigned row = 0; row < nrows; ++row) { diff --git a/scribo/scribo/primitive/internal/rd.hh b/scribo/scribo/primitive/internal/rd.hh index 49b6abb..56d6adc 100644 --- a/scribo/scribo/primitive/internal/rd.hh +++ b/scribo/scribo/primitive/internal/rd.hh @@ -123,7 +123,7 @@ namespace scribo unsigned n = p + dp[j]; if (g.element(n) == true) { - mln_invariant(f.domain().has(f.point_at_index(n))); + mln_invariant(f.domain().has(f.point_at_offset(n))); // Do-Union. unsigned r = Rd_find_root_(parent, n); if (r != p) diff --git a/scribo/scribo/subsampling/integral.hh b/scribo/scribo/subsampling/integral.hh index b6e97d2..8cb627b 100644 --- a/scribo/scribo/subsampling/integral.hh +++ b/scribo/scribo/subsampling/integral.hh @@ -129,14 +129,14 @@ namespace scribo integral_sum_2.init_(output_domain, border_thickness); S* p_isum_2 = integral_sum_2.buffer(); - const unsigned up = sub.delta_index(dpoint2d(-1, 0)); + const unsigned up = sub.delta_offset(dpoint2d(-1, 0)); const unsigned nrows = 3 * output_domain.nrows(); const unsigned ncols = 3 * output_domain.ncols(); unsigned row = 0; - unsigned b_offset = sub.delta_index(dpoint2d(border_thickness, + unsigned b_offset = sub.delta_offset(dpoint2d(border_thickness, border_thickness)); p_sub += b_offset; p_isum += b_offset; @@ -252,14 +252,14 @@ namespace scribo integral_sum_2.init_(output_domain, border_thickness); S* p_isum_2 = integral_sum_2.buffer(); - const unsigned up = sub.delta_index(dpoint2d(-1, 0)); + const unsigned up = sub.delta_offset(dpoint2d(-1, 0)); const unsigned nrows = 2 * output_domain.nrows(); const unsigned ncols = 2 * output_domain.ncols(); extension::fill(sub, 0); - unsigned b_offset = sub.delta_index(dpoint2d(border_thickness, + unsigned b_offset = sub.delta_offset(dpoint2d(border_thickness, border_thickness)); p_sub += b_offset; p_isum += b_offset; diff --git a/scribo/scribo/subsampling/integral_single_image.hh b/scribo/scribo/subsampling/integral_single_image.hh index 381f08f..f1c9c18 100644 --- a/scribo/scribo/subsampling/integral_single_image.hh +++ b/scribo/scribo/subsampling/integral_single_image.hh @@ -122,14 +122,14 @@ namespace scribo integral_sum_sum_2.init_(output_domain, border_thickness); V2* p_integ = integral_sum_sum_2.buffer(); - const int up = sub.delta_index(dpoint2d(-1, 0)); + const int up = sub.delta_offset(dpoint2d(-1, 0)); const unsigned nrows = 3 * output_domain.nrows(); const unsigned ncols = 3 * output_domain.ncols(); unsigned row = 0; - unsigned b_offset = sub.delta_index(dpoint2d(border_thickness, + unsigned b_offset = sub.delta_offset(dpoint2d(border_thickness, border_thickness)); p_sub += b_offset; p_integ += b_offset; @@ -241,14 +241,14 @@ namespace scribo integral_sum_sum_2.init_(output_domain, border_thickness); V2* p_integ = integral_sum_sum_2.buffer(); - const int up = sub.delta_index(dpoint2d(-1, 0)); + const int up = sub.delta_offset(dpoint2d(-1, 0)); const unsigned nrows = 2 * output_domain.nrows(); const unsigned ncols = 2 * output_domain.ncols(); extension::fill(sub, 0); - unsigned b_offset = sub.delta_index(dpoint2d(border_thickness, + unsigned b_offset = sub.delta_offset(dpoint2d(border_thickness, border_thickness)); p_sub += b_offset; p_integ += b_offset; diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index 791d4d0..64b64c7 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -98,7 +98,7 @@ namespace scribo void draw_box(image2d<T>& input, const box2d& b, T2 l) { const unsigned - delta = input.delta_index(dpoint2d(1,0)), + delta = input.delta_offset(dpoint2d(1,0)), nrows = b.nrows(), ncols = b.ncols(); T* p_start = & input(b.pmin()); @@ -133,7 +133,7 @@ namespace scribo if (pmax_col > input_ncols_1) pmax_col = input_ncols_1; const unsigned - delta = input.delta_index(dpoint2d(1,0)), + delta = input.delta_offset(dpoint2d(1,0)), nrows = pmax_row - pmin_row + 1, ncols = pmax_col - pmin_col + 1; T* p_start = & input.at_(pmin_row, pmin_col); diff --git a/scribo/scribo/text/merging_hdoc.hh b/scribo/scribo/text/merging_hdoc.hh index 6f89d2a..a1e4ed9 100644 --- a/scribo/scribo/text/merging_hdoc.hh +++ b/scribo/scribo/text/merging_hdoc.hh @@ -99,7 +99,7 @@ namespace scribo void draw_box(image2d<T>& input, const box2d& b, T2 l) { const unsigned - delta = input.delta_index(dpoint2d(1,0)), + delta = input.delta_offset(dpoint2d(1,0)), nrows = b.nrows(), ncols = b.ncols(); T* p_start = & input(b.pmin()); @@ -134,7 +134,7 @@ namespace scribo if (pmax_col > input_ncols_1) pmax_col = input_ncols_1; const unsigned - delta = input.delta_index(dpoint2d(1,0)), + delta = input.delta_offset(dpoint2d(1,0)), nrows = pmax_row - pmin_row + 1, ncols = pmax_col - pmin_col + 1; T* p_start = & input.at_(pmin_row, pmin_col); -- 1.7.2.5

1 0

olena-2.0-71-g0c8e07f NEWS: Start populating the changes list.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 4 ++++ NEWS | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 96e78df..c844971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + * NEWS: Start populating the changes list. + 2011-11-25 Roland Levillain <roland(a)lrde.epita.fr> Update lrde-scmstats.sh. diff --git a/NEWS b/NEWS index 24590c1..7b7bd3f 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,24 @@ * Olena 2.0a + * Milena + + * Rename 'point_at_index', 'delta_index' and 'index_of_point' to + 'point_at_offset', 'delta_offset' and 'offset_of_point'. + + * Improve extensibility of convert::from_to. + + * Fix compilation with the latest g++ versions (> 4.5). + + * Scribo + + * New logger class. + + * Improve text recognition: recognition speed and storage of + the confidence. + + * New binarization algorithms: Wolf's, Otsu's, Niblack's and + Kim's. + * Olena 2.0 September 16, 2011 -- 1.7.2.5

1 0

olena-2.0-72-g3ce08d0 mln/core/alias/neighb3d.hh: Fix invalid c8_3d neighborhood.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- milena/ChangeLog | 4 ++++ milena/mln/core/alias/neighb3d.hh | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f610a5e..c8f5f24 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/alias/neighb3d.hh: Fix invalid c8_3d neighborhood. + +2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename point_at_index, delta_index and index_of_point. * mln/accu/line.hh, diff --git a/milena/mln/core/alias/neighb3d.hh b/milena/mln/core/alias/neighb3d.hh index cb2d809..6dd1aae 100644 --- a/milena/mln/core/alias/neighb3d.hh +++ b/milena/mln/core/alias/neighb3d.hh @@ -248,10 +248,16 @@ namespace mln static neighb3d it; if (it.size() == 0) { - static const bool vals[] = { 1, 1, 1, - 1, 0, 1, - 1, 1, 1 }; - convert::from_to(vals, it); + window3d& win = it.hook_win_(); + win + .insert(0, 0, 0) + .insert(0, 0, 1) + .insert(0, 0, 2) + .insert(0, 1, 2) + .insert(0, 2, 2) + .insert(0, 2, 1) + .insert(0, 2, 0) + .insert(0, 1, 0); } return it; } -- 1.7.2.5

1 0

olena-2.0-73-gc6498e5 distrib/macports/Portfile.in: Apply changes required by MacPorts team.
by Guillaume Lazzara 22 Aug '12

22 Aug '12

--- ChangeLog | 5 +++++ distrib/macports/Portfile.in | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c844971..41798a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * distrib/macports/Portfile.in: Apply changes required by MacPorts + team. + 2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> * NEWS: Start populating the changes list. diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in index 63f41d7..c15c44f 100644 --- a/distrib/macports/Portfile.in +++ b/distrib/macports/Portfile.in @@ -26,6 +26,8 @@ depends_lib port:GraphicsMagick \ supported_archs i386 x86_64 configure.args-append --with-imagemagickxx=no +# code violates aliasing rules +configure.cxxflags-append -fno-strict-aliasing variant scribo description {Add a DIA framework} { depends_lib-append port:tesseract \ @@ -41,9 +43,4 @@ variant swilena description {Add Python bindings} { configure.args-append --enable-swilena } -# Temporary workaround because of a Apple's GCC bug. -platform darwin 11 { - configure.env-append CXXFLAGS=-fno-strict-aliasing -} - default_variants +scribo -- 1.7.2.5

1 0

branch IJDAR/sauvola_ms deleted: olena-2.0-117-gba5badd
by git＠lrde.epita.fr 22 Aug '12

22 Aug '12

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 IJDAR/sauvola_ms has been deleted was ba5badd9d9719afaea44bd06716cb27462ad4e18 ----------------------------------------------------------------------- ba5badd9d9719afaea44bd06716cb27462ad4e18 Make the area value depends on the first scale ratio. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch papers/IJDAR/sauvola_ms created: olena-2.0-117-gba5badd
by git＠lrde.epita.fr 22 Aug '12

22 Aug '12

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 papers/IJDAR/sauvola_ms has been created at ba5badd9d9719afaea44bd06716cb27462ad4e18 (commit) - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch skewness updated: olena-2.0-117-gba5badd
by git＠lrde.epita.fr 22 Aug '12

22 Aug '12

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 skewness has been updated via ba5badd9d9719afaea44bd06716cb27462ad4e18 (commit) via 7e6c395eca45831b7ee1e2b66cbf07f6256c8850 (commit) via 1223520e60a723087a715e6d7de958e6725f1a64 (commit) from d1d6d8452e7be68f882d711281d77fbb8d6b8765 (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: scribo/ChangeLog | 59 ++++++++++++++++++++ .../binarization/internal/local_threshold_core.hh | 20 +++++-- .../binarization/internal/niblack_formula.hh | 2 +- .../binarization/internal/niblack_functor.hh | 48 ++++------------ ...{niblack_functor.hh => niblack_functor_fast.hh} | 33 ++++++----- .../internal/niblack_threshold_functor.hh | 13 +++- .../binarization/internal/sauvola_functor.hh | 14 +++-- .../internal/sauvola_threshold_functor.hh | 13 +++- .../scribo/binarization/internal/wolf_functor.hh | 44 +++++---------- .../{wolf_functor.hh => wolf_functor_fast.hh} | 39 +++++++------ scribo/scribo/binarization/niblack.hh | 1 - .../binarization/{niblack.hh => niblack_fast.hh} | 44 +++++++-------- scribo/scribo/binarization/sauvola_ms.hh | 10 +-- scribo/scribo/binarization/wolf.hh | 11 ++-- .../scribo/binarization/{wolf.hh => wolf_fast.hh} | 41 +++++++------- scribo/src/binarization/sauvola_ms_split.cc | 6 +- scribo/tests/binarization/Makefile.am | 20 +++++- scribo/tests/binarization/niblack.cc | 16 +++--- scribo/tests/binarization/niblack.ref.pbm | Bin 32884 -> 32884 bytes .../binarization/{wolf.cc => niblack_fast.cc} | 20 +++--- .../{niblack.ref.pbm => niblack_fast.ref.pbm} | Bin 32884 -> 32884 bytes ...odd.ref.pbm => niblack_fast_weven_hodd.ref.pbm} | Bin 32820 -> 32820 bytes ...ven.ref.pbm => niblack_fast_wodd_heven.ref.pbm} | Bin 32884 -> 32884 bytes ...hodd.ref.pbm => niblack_fast_wodd_hodd.ref.pbm} | Bin 32820 -> 32820 bytes .../tests/binarization/niblack_weven_hodd.ref.pbm | Bin 32820 -> 32820 bytes .../tests/binarization/niblack_wodd_heven.ref.pbm | Bin 32884 -> 32884 bytes .../tests/binarization/niblack_wodd_hodd.ref.pbm | Bin 32820 -> 32820 bytes scribo/tests/binarization/sauvola_ms.cc | 16 +++--- scribo/tests/binarization/sauvola_ms.ref.pbm | Bin 32884 -> 32884 bytes .../binarization/sauvola_ms_weven_hodd.ref.pbm | Bin 32820 -> 32820 bytes .../binarization/sauvola_ms_wodd_heven.ref.pbm | Bin 32884 -> 32884 bytes .../binarization/sauvola_ms_wodd_hodd.ref.pbm | Bin 32820 -> 32820 bytes scribo/tests/binarization/wolf.cc | 16 +++--- scribo/tests/binarization/wolf.ref.pbm | Bin 32884 -> 32884 bytes .../tests/binarization/{wolf.cc => wolf_fast.cc} | 18 +++--- .../{wolf.ref.pbm => wolf_fast.ref.pbm} | Bin 32884 -> 32884 bytes ...n_hodd.ref.pbm => wolf_fast_weven_hodd.ref.pbm} | Bin 32820 -> 32820 bytes ..._heven.ref.pbm => wolf_fast_wodd_heven.ref.pbm} | Bin 32884 -> 32884 bytes ...dd_hodd.ref.pbm => wolf_fast_wodd_hodd.ref.pbm} | Bin 32820 -> 32820 bytes scribo/tests/binarization/wolf_weven_hodd.ref.pbm | Bin 32820 -> 32820 bytes scribo/tests/binarization/wolf_wodd_heven.ref.pbm | Bin 32884 -> 32884 bytes scribo/tests/binarization/wolf_wodd_hodd.ref.pbm | Bin 32820 -> 32820 bytes 42 files changed, 279 insertions(+), 225 deletions(-) copy scribo/scribo/binarization/internal/{niblack_functor.hh => niblack_functor_fast.hh} (80%) copy scribo/scribo/binarization/internal/{wolf_functor.hh => wolf_functor_fast.hh} (81%) copy scribo/scribo/binarization/{niblack.hh => niblack_fast.hh} (69%) copy scribo/scribo/binarization/{wolf.hh => wolf_fast.hh} (81%) copy scribo/tests/binarization/{wolf.cc => niblack_fast.cc} (75%) copy scribo/tests/binarization/{niblack.ref.pbm => niblack_fast.ref.pbm} (100%) copy scribo/tests/binarization/{niblack_weven_hodd.ref.pbm => niblack_fast_weven_hodd.ref.pbm} (100%) copy scribo/tests/binarization/{niblack_wodd_heven.ref.pbm => niblack_fast_wodd_heven.ref.pbm} (100%) copy scribo/tests/binarization/{niblack_wodd_hodd.ref.pbm => niblack_fast_wodd_hodd.ref.pbm} (100%) copy scribo/tests/binarization/{wolf.cc => wolf_fast.cc} (77%) copy scribo/tests/binarization/{wolf.ref.pbm => wolf_fast.ref.pbm} (100%) copy scribo/tests/binarization/{wolf_weven_hodd.ref.pbm => wolf_fast_weven_hodd.ref.pbm} (100%) copy scribo/tests/binarization/{wolf_wodd_heven.ref.pbm => wolf_fast_wodd_heven.ref.pbm} (100%) copy scribo/tests/binarization/{wolf_wodd_hodd.ref.pbm => wolf_fast_wodd_hodd.ref.pbm} (100%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0