- Olena-patches

olena-2.0-227-gc37c727 configure.ac: Check for libpoppler dependency and configure pdf::load test directory.
by Guillaume Lazzara 28 Feb '13

28 Feb '13

--- ChangeLog | 5 +++++ configure.ac | 9 +++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5faf2a3..e9c4413 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-02-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Check for libpoppler dependency and configure + pdf::load test directory. + 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Link to libGraphicsMagick++ if GraphicsMagick++ is diff --git a/configure.ac b/configure.ac index f430c47..17b0d0e 100644 --- a/configure.ac +++ b/configure.ac @@ -264,6 +264,14 @@ OLN_WITH_TESSERACT OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) +# ----------------- # +# Poppler library. # +# ----------------- # + +OLN_WITH_LIB_PKG_CONFIG([poppler-cpp], [poppler/cpp/poppler-version.h], [poppler-cpp], + [poppler], [POPPLER]) + + # --------------------------------- # # GDCM library (Grassroots DiCom). # # --------------------------------- # @@ -475,6 +483,7 @@ AC_CONFIG_FILES([ milena/tests/io/off/Makefile milena/tests/io/pbm/Makefile milena/tests/io/pbms/Makefile + milena/tests/io/pdf/Makefile milena/tests/io/pfm/Makefile milena/tests/io/pgm/Makefile milena/tests/io/pgms/Makefile -- 1.7.2.5

1 0

branch compil/clang++ updated: olena-2.0-226-g5c89353
by git＠lrde.epita.fr 28 Feb '13

28 Feb '13

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 compil/clang++ has been updated discards 2f4dfa5654c4e3ef243a8f78b289ce1ca504fd20 (commit) via 5c89353103b3d68292c6770e173fe9f18a0097da (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (2f4dfa5654c4e3ef243a8f78b289ce1ca504fd20) \ N -- N -- N (5c89353103b3d68292c6770e173fe9f18a0097da) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5c89353 Fix different forward declarations (class/struct) in scribo/core ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-225-gb460ca0 Fix compilation issue for nonexistant explicit conversion
by Anthony Seure 28 Feb '13

28 Feb '13

--- scribo/scribo/primitive/extract/lines_h_single.hh | 4 +++- scribo/scribo/primitive/extract/lines_v_single.hh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scribo/scribo/primitive/extract/lines_h_single.hh b/scribo/scribo/primitive/extract/lines_h_single.hh index 1bff2f4..1f3a783 100644 --- a/scribo/scribo/primitive/extract/lines_h_single.hh +++ b/scribo/scribo/primitive/extract/lines_h_single.hh @@ -154,8 +154,10 @@ namespace scribo mln_precondition(nbh.is_valid()); typedef mln_ch_value(I,V) L; + V ncomps; component_set<L> - output = primitive::extract::components(input, nbh, nlines); + output = primitive::extract::components(input, nbh, ncomps); + (void) ncomps; internal::is_line_h_single<L> is_line(output, w_h_ratio, min_line_length); diff --git a/scribo/scribo/primitive/extract/lines_v_single.hh b/scribo/scribo/primitive/extract/lines_v_single.hh index 67b9f9d..1d81626 100644 --- a/scribo/scribo/primitive/extract/lines_v_single.hh +++ b/scribo/scribo/primitive/extract/lines_v_single.hh @@ -151,8 +151,10 @@ namespace scribo mln_precondition(nbh.is_valid()); typedef mln_ch_value(I,V) L; + V ncomps; component_set<L> - output = primitive::extract::components(input, nbh, nlines); + output = primitive::extract::components(input, nbh, ncomps); + (void) ncomps; internal::is_line_v_single<L> is_line(output, h_w_ratio, min_line_length); -- 1.7.2.5

2 1

olena-2.0-88-gbe4cd84 Change values of site sets examples (out of boxes).
by Anthony Seure 28 Feb '13

28 Feb '13

--- .../examples/split/tuto4_site_set_create-1.cc.raw | 2 +- .../examples/split/tuto4_site_set_create-5.cc.raw | 2 +- milena/doc/examples/tuto4/site_set_create.cc | 4 ++-- .../doc/outputs/split/tuto4_site_set_create-1.txt | 2 +- .../doc/outputs/split/tuto4_site_set_create-3.txt | 2 +- milena/doc/outputs/tuto4_site_set_create.txt | 4 ++-- milena/doc/tutorial.tex | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/milena/doc/examples/split/tuto4_site_set_create-1.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-1.cc.raw index f0f498e..f0748f9 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-1.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-1.cc.raw @@ -1 +1 @@ - box2d b(4,4); + box2d b(3,3); diff --git a/milena/doc/examples/split/tuto4_site_set_create-5.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-5.cc.raw index 1bbf4c0..6df6b86 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-5.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-5.cc.raw @@ -1 +1 @@ - box2d b = make::box2d(-2,-2, 2, 2); + box2d b = make::box2d(-1,-1, 1, 1); diff --git a/milena/doc/examples/tuto4/site_set_create.cc b/milena/doc/examples/tuto4/site_set_create.cc index d7cf355..a4a009a 100644 --- a/milena/doc/examples/tuto4/site_set_create.cc +++ b/milena/doc/examples/tuto4/site_set_create.cc @@ -9,7 +9,7 @@ int main() using namespace mln; // \{ - box2d b(4,4); + box2d b(3,3); // \} doc::begin_output(); @@ -41,7 +41,7 @@ int main() { // \{ - box2d b = make::box2d(-2,-2, 2, 2); + box2d b = make::box2d(-1,-1, 1, 1); // \} doc::begin_output(); diff --git a/milena/doc/outputs/split/tuto4_site_set_create-1.txt b/milena/doc/outputs/split/tuto4_site_set_create-1.txt index 915e60e..8256a1e 100644 --- a/milena/doc/outputs/split/tuto4_site_set_create-1.txt +++ b/milena/doc/outputs/split/tuto4_site_set_create-1.txt @@ -1 +1 @@ -(0,0), (0,1), (0,2), (0,3), (1,0), (1,1), (1,2), (1,3), (2,0), (2,1), (2,2), (2,3), (3,0), (3,1), (3,2), (3,3), +(0,0), (0,1), (0,2), (1,0), (1,1), (1,2), (2,0), (2,1), (2,2), diff --git a/milena/doc/outputs/split/tuto4_site_set_create-3.txt b/milena/doc/outputs/split/tuto4_site_set_create-3.txt index ecb9a3b..3088f66 100644 --- a/milena/doc/outputs/split/tuto4_site_set_create-3.txt +++ b/milena/doc/outputs/split/tuto4_site_set_create-3.txt @@ -1 +1 @@ -(-2,-2), (-2,-1), (-2,0), (-2,1), (-2,2), (-1,-2), (-1,-1), (-1,0), (-1,1), (-1,2), (0,-2), (0,-1), (0,0), (0,1), (0,2), (1,-2), (1,-1), (1,0), (1,1), (1,2), (2,-2), (2,-1), (2,0), (2,1), (2,2), +(-1,-1), (-1,0), (-1,1), (0,-1), (0,0), (0,1), (1,-1), (1,0), (1,1), diff --git a/milena/doc/outputs/tuto4_site_set_create.txt b/milena/doc/outputs/tuto4_site_set_create.txt index c711d72..2c4cd98 100644 --- a/milena/doc/outputs/tuto4_site_set_create.txt +++ b/milena/doc/outputs/tuto4_site_set_create.txt @@ -1,9 +1,9 @@ // \{ -(0,0), (0,1), (0,2), (0,3), (1,0), (1,1), (1,2), (1,3), (2,0), (2,1), (2,2), (2,3), (3,0), (3,1), (3,2), (3,3), +(0,0), (0,1), (0,2), (1,0), (1,1), (1,2), (2,0), (2,1), (2,2), // \} // \{ (2,2), (1,2), // \} // \{ -(-2,-2), (-2,-1), (-2,0), (-2,1), (-2,2), (-1,-2), (-1,-1), (-1,0), (-1,1), (-1,2), (0,-2), (0,-1), (0,0), (0,1), (0,2), (1,-2), (1,-1), (1,0), (1,1), (1,2), (2,-2), (2,-1), (2,0), (2,1), (2,2), +(-1,-1), (-1,0), (-1,1), (0,-1), (0,0), (0,1), (1,-1), (1,0), (1,1), // \} diff --git a/milena/doc/tutorial.tex b/milena/doc/tutorial.tex index d975de4..9f1f6cb 100644 --- a/milena/doc/tutorial.tex +++ b/milena/doc/tutorial.tex @@ -1252,7 +1252,7 @@ constructed from given \var{pmax} coordinates: \doxycode[1]{tuto4_site_set_create} -This box is defined from \val{(0,0)} to \val{(4,4)} : +This box is defined from \val{(0,0)} to \val{(3,3)} : \doxymoutput[1]{tuto4_site_set_create} @@ -1260,7 +1260,7 @@ A box can also starts from a site different from \val{(0,0)}. \doxycode[5]{tuto4_site_set_create} -This box is defined from \val{(-2,-2)} to \val{(2,2)} : +This box is defined from \val{(-1,-1)} to \val{(1,1)} : \doxymoutput[3]{tuto4_site_set_create} -- 1.7.2.5

2 1

olena-2.0-87-g85a99c4 Fix mistakes and add a Git downloading procedure in the documentation.
by Anthony Seure 28 Feb '13

28 Feb '13

--- .../examples/split/tuto3_first_routine-1.cc.raw | 1 - milena/doc/examples/tuto3/first_routine.cc | 1 - milena/doc/tutorial.tex | 66 ++++++++++++++++--- 3 files changed, 55 insertions(+), 13 deletions(-) diff --git a/milena/doc/examples/split/tuto3_first_routine-1.cc.raw b/milena/doc/examples/split/tuto3_first_routine-1.cc.raw index 3e66206..3299e30 100644 --- a/milena/doc/examples/split/tuto3_first_routine-1.cc.raw +++ b/milena/doc/examples/split/tuto3_first_routine-1.cc.raw @@ -6,7 +6,6 @@ #include <mln/labeling/blobs.hh> #include <mln/labeling/compute.hh> -#include <mln/labeling/blobs.hh> #include <mln/data/compare.hh> diff --git a/milena/doc/examples/tuto3/first_routine.cc b/milena/doc/examples/tuto3/first_routine.cc index 609fd4e..dd97a1c 100644 --- a/milena/doc/examples/tuto3/first_routine.cc +++ b/milena/doc/examples/tuto3/first_routine.cc @@ -10,7 +10,6 @@ #include <mln/labeling/blobs.hh> #include <mln/labeling/compute.hh> -#include <mln/labeling/blobs.hh> #include <mln/data/compare.hh> diff --git a/milena/doc/tutorial.tex b/milena/doc/tutorial.tex index 8fee888..d975de4 100644 --- a/milena/doc/tutorial.tex +++ b/milena/doc/tutorial.tex @@ -159,7 +159,8 @@ The latter may also be interested by the Developer HTML documentation There are two ways of getting Milena on the web: \begin{itemize} \item Download a tarball/package from the website, - \item Checkout the SVN repository. + \item Checkout the SVN repository, + \item Clone the Git repository. \end{itemize} Downloading a package or a tarball is the best choice for a new user. Except @@ -188,6 +189,49 @@ We strongly advise you to not use it for production use. %download page. %-------------------------- +\doxysubsection{tuto1dowloadinggit}{Downloading from Git} + +First, be sure that Git is already installed on your system. +Open a terminal and type: + +\begin{verbatim} +$ git --version +git version 1.7.10.4 +\end{verbatim} + +You should see your version of Git installed. If you read 'Command not found' +then you need to install Git. + +To install Git on Debin or Ubuntu, run: +\begin{verbatim} +$ sudo apt-get install git +\end{verbatim} + +For other distributions, please refer to the user documentation of your system. + +Once you have Git installed, go to the directoy where you would like to download +Olena and then, clone the repository with the following command: + +\begin{verbatim} +$ git clone git@git.lrde.epita.fr:olena +\end{verbatim} + +Enter the 'olena' directory. + +\begin{verbatim} +$ cd olena +\end{verbatim} + +You are now ready to configure the directory and install Milena as described in +section \doxyref{tuto2}. +We invite you to take a look at the description of the directory structure +(section \doxyref{tuto1dirstruct}). +If you encounter any issues in the installation process or if you have any +question, do not forget to join the mailing lists (section +\doxyref{tuto1mailinglists}) and/or use the other documentations resources +(section ref{tuto1documentation}). +%-------------------------- + \doxysubsection{tuto1downloadingsvn}{Downloading from SVN} First, be sure that SVN is already installed on your system. @@ -601,12 +645,12 @@ your system, generating the doc and compiling the test suite and the examples. %************************** -\doxysection{tuto2bootstrap}{Bootstrap (SVN Sources)} +\doxysection{tuto2bootstrap}{Bootstrap (Git Sources)} If you got the sources from a package/tarball, you can skip this section. Go to section \doxyref{tuto2configure}. -If you downloaded the sources from the SVN repository, you must launch a +If you downloaded the sources from the Git repository, you must launch a script before configuring the build directory. Run the following: @@ -1070,10 +1114,10 @@ This trace allows to follow the stack trace at runtime. It also provides the time passed in each function call if the call last at least 10ms. In order to enable traces in a program, set the related global variable to -true: +false: \begin{verbatim} ... -trace::quiet = true; +trace::quiet = false; ... \end{verbatim} @@ -1102,7 +1146,7 @@ labeling::blobs { } labeling::blobs - 0.08s \end{verbatim} -As you can see, \code{labeling::blobs} is located just after having set +As you can see, \code{labeling::blobs} is located just before having set \var{trace::quiet} to \val{true} so its trace is part of the output. \code{geom::bbox}'s trace is not part of the output though since traces have been disabled just before it is called. @@ -1116,7 +1160,7 @@ Milena also provides a lot of debug tools. Here is a small list of the tools: \doxymoutput[1]{tuto3_println} \item mln::debug::println\_with\_border, print an image in the console withs - its border. + its border (3 by default). \doxycode[2]{tuto3_println} \doxymoutput[2]{tuto3_println} @@ -1214,16 +1258,16 @@ This box is defined from \val{(0,0)} to \val{(4,4)} : A box can also starts from a site different from \val{(0,0)}. -\doxycode[4]{tuto4_site_set_create} +\doxycode[5]{tuto4_site_set_create} -This box is defined from \val{(0,0)} to \val{(4,4)} : +This box is defined from \val{(-2,-2)} to \val{(2,2)} : \doxymoutput[3]{tuto4_site_set_create} Another common site set is \type{p\_array}. It contains only sites which have been added to it. -\doxycode[2]{tuto4_site_set_create} +\doxycode[3]{tuto4_site_set_create} This site only contains : @@ -1471,7 +1515,7 @@ is a workaround to make it read-write. \begin{center} \begin{tabular}{c c c} \doxyimg{small-enlarged}{3cm} & ~\huge{$\rightarrow$}~ & \doxyfigure[1]{tuto4_genericity_and_algorithms}{3cm} \\ - \multicolumn{3}{c}{Fill with blue a region of interest defined by a + \multicolumn{3}{c}{Fill with green a region of interest defined by a \type{box2d}.} \\ \end{tabular} \end{center} -- 1.7.2.5

2 1

branch compil/clang++ created: olena-2.0-226-g2f4dfa5
by git＠lrde.epita.fr 27 Feb '13

27 Feb '13

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 compil/clang++ has been created at 2f4dfa5654c4e3ef243a8f78b289ce1ca504fd20 (commit) - Log ----------------------------------------------------------------- 2f4dfa5 Fix different fast-forwards (class/struct) in scribo/core ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-226-g2f4dfa5 Fix different fast-forwards (class/struct) in scribo/core
by Anthony Seure 27 Feb '13

27 Feb '13

--- scribo/scribo/core/component_set.hh | 2 +- scribo/scribo/core/line_set.hh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index ded64ae..07114c9 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -70,7 +70,7 @@ namespace scribo { // Forward declaration. - template <typename L> struct component_set; + template <typename L> class component_set; namespace internal diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index db987e6..c841079 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -56,8 +56,8 @@ namespace scribo { // Forward declaration. - template <typename L> struct line_set; - template <typename L> struct line_info; + template <typename L> class line_set; + template <typename L> class line_info; typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; -- 1.7.2.5

1 0

olena-2.0-226-g5c89353 Fix different forward declarations (class/struct) in scribo/core
by Anthony Seure 27 Feb '13

27 Feb '13

--- scribo/ChangeLog | 14 ++++++++++++++ scribo/scribo/core/component_set.hh | 2 +- scribo/scribo/core/line_set.hh | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index c4bdcfc..3769ae3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,17 @@ +2013-02-27 Anthony Seure <anthony.seure(a)lrde.epita.fr> + + Fix different forward declarations (class/struct) in scribo/core + + * scribo/core/component_set.hh + * scribo/core/line_set.hh + +2013-02-27 Anthony Seure <anthony.seure(a)lrde.epita.fr> + + Fix compilation issue for nonexistant explicit conversion + + * scribo/primitive/extract/lines_h_single.hh + * scribo/primitive/extract/lines_v_single.hh + 2013-02-26 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Update. diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index ded64ae..07114c9 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -70,7 +70,7 @@ namespace scribo { // Forward declaration. - template <typename L> struct component_set; + template <typename L> class component_set; namespace internal diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index db987e6..c841079 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -56,8 +56,8 @@ namespace scribo { // Forward declaration. - template <typename L> struct line_set; - template <typename L> struct line_info; + template <typename L> class line_set; + template <typename L> class line_info; typedef mln::util::object_id<scribo::LineId, unsigned> line_id_t; -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-225-gb460ca0
by git＠lrde.epita.fr 27 Feb '13

27 Feb '13

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 unstable/scribo has been updated via b460ca006fc7f6d667402ef56cd474e422ab61d2 (commit) from 69a8bfc3ef6b444b37f7c6d2e974d86ef5d4488a (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 ----------------------------------------------------------------- b460ca0 Fix compilation issue for nonexistant explicit conversion ----------------------------------------------------------------------- Summary of changes: scribo/scribo/primitive/extract/lines_h_single.hh | 4 +++- scribo/scribo/primitive/extract/lines_v_single.hh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-226-g219cea3 AUTHORS: Add Antoine Froger.
by Guillaume Lazzara 27 Feb '13

27 Feb '13

--- AUTHORS | 3 +++ ChangeLog | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index f12b60e..6b74958 100644 --- a/AUTHORS +++ b/AUTHORS @@ -63,6 +63,9 @@ Past contributors of LRDE Staff. Interns. ======== +* Antoine Froger + - Graphical improvements of SCRIBO viewer. + * Arthur Crépin-Leblond - SCRIBO structured outputs (XML, HTML, PDF). diff --git a/ChangeLog b/ChangeLog index 50a9ad3..743ccaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2013-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + * AUTHORS: Add Antoine Froger. + +2013-02-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Move new viewer to scribo/demo. * GScribo/BUGS, -- 1.7.2.5

1 0