November 2011 - Olena-patches

olena-2.0-18-gec7416a README: update requirements information.
by Guillaume Lazzara 21 Nov '11

21 Nov '11

--- scribo/ChangeLog | 4 ++++ scribo/README | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 07a1a29..ccabd9d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-11-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + * README: update requirements information. + 2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/text/recognition.hh: Fix code for Tesseract 3.01 diff --git a/scribo/README b/scribo/README index 84fe60a..af325a8 100644 --- a/scribo/README +++ b/scribo/README @@ -59,7 +59,7 @@ dependencies should be installed : - xsltproc - fop - GraphicsMagick++ or ImageMagick++ -- Tesseract 2.x or 3.x (strongly recommended) +- Tesseract 2.x or 3.01 minimum (strongly recommended) Warning: Tesseract 2.x is still supported however, you may encounter crashes because of bugs with Tesseract and specific locales. Moreover, @@ -74,6 +74,10 @@ KNOWN ISSUES - Tesseract 2.x may cause crashes with specific system locales. It is fixed in Tesseract 3.x +- From Tesseract 3.00 to 3.01 API has changed, introducing + incompatibilities. We chose to be compatible with the latest version. + Hence, Scribo will not compile with Tesseract 3.00. + - Apple's GCC (llvm-{gcc,g++} 4.2) compiler provided with Mac OS X Lion (10.7.0) has some trouble with strict aliasing and our code. If you encounter any crashes or strange behaviors, try compiling with -- 1.7.2.5

1 0

branch apps-morphers updated: olena-2.0-12-g21c2800
by git＠lrde.epita.fr 18 Nov '11

18 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch apps-morphers has been updated via 21c2800d395c87adb3e456adb3a2f1ece83fe0fd (commit) via 558a2abb439427e9f267698ce3f1541bda95b395 (commit) from 6b931cc6d218c25448e7bf3479c98c16acd7daa1 (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 ----------------------------------------------------------------- 21c2800 Simplify some apps/morpher programs using mln::make::box2d. 558a2ab Refactor apps/morphers. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 19 +++++ milena/apps/morphers/Makefile.am | 4 +- milena/apps/morphers/mask+channel.cc | 5 +- milena/apps/morphers/mask+recorder.cc | 85 ++------------------- milena/apps/morphers/recorder.cc | 79 +------------------ milena/apps/morphers/{recorder.cc => recorder.hh} | 35 ++------- 6 files changed, 42 insertions(+), 185 deletions(-) copy milena/apps/morphers/{recorder.cc => recorder.hh} (74%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-12-g21c2800 Simplify some apps/morpher programs using mln::make::box2d.
by Roland Levillain 18 Nov '11

18 Nov '11

* apps/morphers/mask+recorder.cc, * apps/morphers/mask+channel.cc: Here. --- milena/ChangeLog | 8 ++++++++ milena/apps/morphers/mask+channel.cc | 5 +++-- milena/apps/morphers/mask+recorder.cc | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 554d827..21db4fd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2011-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Simplify some apps/morpher programs using mln::make::box2d. + + * apps/morphers/mask+recorder.cc, + * apps/morphers/mask+channel.cc: + Here. + +2011-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Refactor apps/morphers. * apps/morphers/recorder.cc, diff --git a/milena/apps/morphers/mask+channel.cc b/milena/apps/morphers/mask+channel.cc index ffbe023..2e170a2 100644 --- a/milena/apps/morphers/mask+channel.cc +++ b/milena/apps/morphers/mask+channel.cc @@ -33,11 +33,12 @@ #include <string> #include <mln/core/image/image2d.hh> +#include <mln/make/box2d.hh> #include <mln/core/image/dmorph/image_if.hh> -#include <mln/fun/component/green.hh> #include <mln/value/rgb8.hh> +#include <mln/fun/component/green.hh> /* FIXME: We wanted to use `fun_image' and `operator<<' from <mln/core/image/vmorph/fun_image.hh, but they only create read-only images. Use `thru_image' instead. */ @@ -63,7 +64,7 @@ int main() /* FIXME: Cheat: use generic fill as mln::decorated_image does not define properly its properties. */ data::impl::generic::fill_with_value((thru(green, lena).rw() | - box2d(point2d(5,5), point2d(10,10))).rw(), + make::box2d(5,5, 10,10)).rw(), 255); io::ppm::save(lena, "lena-mask-channel.ppm"); } diff --git a/milena/apps/morphers/mask+recorder.cc b/milena/apps/morphers/mask+recorder.cc index 4689a99..2693dbc 100644 --- a/milena/apps/morphers/mask+recorder.cc +++ b/milena/apps/morphers/mask+recorder.cc @@ -37,6 +37,7 @@ #include <string> #include <mln/core/image/image2d.hh> +#include <mln/make/box2d.hh> #include <mln/core/image/dmorph/image_if.hh> #include <mln/value/rgb8.hh> @@ -60,8 +61,7 @@ int main() decorated_image< I, recorder > lena_rec = record(lena); /* FIXME: Cheat: use generic fill as mln::decorated_image does not define properly its properties. */ - data::impl::generic::fill_with_value((lena_rec | box2d(point2d(5,5), - point2d(10,10))).rw(), + data::impl::generic::fill_with_value((lena_rec | make::box2d(5,5, 10,10)).rw(), literal::green); ppm::save(lena_rec, "lena-roi-fill"); } -- 1.7.2.5

1 0

olena-2.0-11-g558a2ab Refactor apps/morphers.
by Roland Levillain 18 Nov '11

18 Nov '11

* apps/morphers/recorder.cc, * apps/morphers/mask+recorder.cc: Factor common parts... * apps/morphers/recorder.hh: ...here (new file). * apps/morphers/Makefile.am (recorder_SOURCES, mask_recorder_SOURCES): Add recorder.hh. --- milena/ChangeLog | 11 +++ milena/apps/morphers/Makefile.am | 4 +- milena/apps/morphers/mask+recorder.cc | 81 +-------------------- milena/apps/morphers/recorder.cc | 79 +------------------- milena/apps/morphers/{recorder.cc => recorder.hh} | 35 ++------- 5 files changed, 29 insertions(+), 181 deletions(-) copy milena/apps/morphers/{recorder.cc => recorder.hh} (74%) diff --git a/milena/ChangeLog b/milena/ChangeLog index c10deb8..554d827 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2011-11-18 Roland Levillain <roland(a)lrde.epita.fr> + + Refactor apps/morphers. + + * apps/morphers/recorder.cc, + * apps/morphers/mask+recorder.cc: + Factor common parts... + * apps/morphers/recorder.hh: ...here (new file). + * apps/morphers/Makefile.am + (recorder_SOURCES, mask_recorder_SOURCES): Add recorder.hh. + 2011-11-14 Roland Levillain <roland(a)lrde.epita.fr> Add examples of morphers. diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index d7af433..d448c1d 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -28,8 +28,8 @@ noinst_PROGRAMS = \ mask+recorder mask_channel_SOURCES = mask+channel.cc -recorder_SOURCES = recorder.cc -mask_recorder_SOURCES = mask+recorder.cc +recorder_SOURCES = recorder.cc recorder.hh +mask_recorder_SOURCES = mask+recorder.cc recorder.hh MOSTLYCLEANFILES = \ lena-mask-channel.ppm \ diff --git a/milena/apps/morphers/mask+recorder.cc b/milena/apps/morphers/mask+recorder.cc index d697451..4689a99 100644 --- a/milena/apps/morphers/mask+recorder.cc +++ b/milena/apps/morphers/mask+recorder.cc @@ -24,7 +24,7 @@ // executable file might be covered by the GNU General Public License. /// \file -/// \brief Morpher recording every change in the morphed image +/// \brief Exercise a morpher recording every change in the morphed image /// followed by the application of a domain restriction with a mask. /// /// To produce an AVI movie from the `lena-roi-fill*.ppm' files, use: @@ -34,93 +34,20 @@ /// /// The output `lena-roi-fill.avi' can be embedded in a PDF file. */ -// FIXME: Factor with recorder.cc. - -#include <sstream> -#include <iomanip> - #include <string> #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/image_if.hh> -#include <mln/core/image/imorph/decorated_image.hh> #include <mln/value/rgb8.hh> - -#include <mln/core/routine/duplicate.hh> - #include <mln/literal/colors.hh> #include <mln/data/fill.hh> -#include <mln/io/ppm/all.hh> - -#include "apps/data.hh" - - -// FIXME: mln::decorated_image lacks a proper definition of -// properties! (see mln/core/image/imorph/decorated_image.hh -namespace mln -{ - - namespace trait - { - - template <typename I, typename D> - struct image_< decorated_image<I,D> > - : default_image_morpher< I, - mln_value(I), - decorated_image<I,D> > - { - typedef trait::image::category::identity_morpher category; - }; - - } // end of namespace mln::trait +#include <mln/io/ppm/load.hh> -} // end of namespace mln +#include "apps/morphers/recorder.hh" - -// Recorder. -template <typename I> -struct recorder -{ - void reading(const I&, const mln_psite(I)&) const - { - // N/A. - } - - void writing(I& ima, const mln_psite(I)&, const mln_value(I)&) - { - sequence.push_back(mln::duplicate(ima)); - } - - std::vector sequence; -}; - -template <typename I> -mln::decorated_image< I, recorder > -record(mln::Image& ima) -{ - return mln::decorate(ima, recorder()); -} - - -// I/O. -namespace ppm -{ - template <typename I> - void - save(const mln::decorated_image< I, recorder >& rec, - const std::string& prefix) - { - for (size_t i = 0; i < rec.decoration().sequence.size(); ++i) - { - std::stringstream s; - s << std::setfill ('0') << std::setw (6) << i; - mln::io::ppm::save(rec.decoration().sequence[i], - prefix + s.str() + ".ppm"); - } - } -} +#include "apps/data.hh" int main() diff --git a/milena/apps/morphers/recorder.cc b/milena/apps/morphers/recorder.cc index 195f24c..4a3f1ab 100644 --- a/milena/apps/morphers/recorder.cc +++ b/milena/apps/morphers/recorder.cc @@ -24,7 +24,7 @@ // executable file might be covered by the GNU General Public License. /// \file -/// \brief Morpher recording every change in the morphed image. +/// \brief Exercise a morpher recording every change in the morphed image. /// /// To produce an AVI movie from the `lena-fill*.ppm' files, use: /// @@ -33,90 +33,19 @@ /// /// The output `lena-fill.avi' can be embedded in a PDF file. */ -#include <sstream> -#include <iomanip> - #include <string> #include <mln/core/image/image2d.hh> -#include <mln/core/image/imorph/decorated_image.hh> #include <mln/value/rgb8.hh> - -#include <mln/core/routine/duplicate.hh> - #include <mln/literal/colors.hh> #include <mln/data/fill.hh> -#include <mln/io/ppm/all.hh> - -#include "apps/data.hh" - - -// FIXME: mln::decorated_image lacks a proper definition of -// properties! (see mln/core/image/imorph/decorated_image.hh -namespace mln -{ - - namespace trait - { - - template <typename I, typename D> - struct image_< decorated_image<I,D> > - : default_image_morpher< I, - mln_value(I), - decorated_image<I,D> > - { - typedef trait::image::category::identity_morpher category; - }; - - } // end of namespace mln::trait - -} // end of namespace mln +#include <mln/io/ppm/load.hh> +#include "apps/morphers/recorder.hh" -// Recorder. -template <typename I> -struct recorder -{ - void reading(const I&, const mln_psite(I)&) const - { - // N/A. - } - - void writing(I& ima, const mln_psite(I)&, const mln_value(I)&) - { - sequence.push_back(mln::duplicate(ima)); - } - - std::vector sequence; -}; - -template <typename I> -mln::decorated_image< I, recorder > -record(mln::Image& ima) -{ - return mln::decorate(ima, recorder()); -} - - -// I/O. -namespace ppm -{ - template <typename I> - void - save(const mln::decorated_image< I, recorder >& rec, - const std::string& prefix) - { - for (size_t i = 0; i < rec.decoration().sequence.size(); ++i) - { - std::stringstream s; - s << std::setfill ('0') << std::setw (6) << i; - mln::io::ppm::save(rec.decoration().sequence[i], - prefix + s.str() + ".ppm"); - } - } -} +#include "apps/data.hh" int main() diff --git a/milena/apps/morphers/recorder.cc b/milena/apps/morphers/recorder.hh similarity index 74% copy from milena/apps/morphers/recorder.cc copy to milena/apps/morphers/recorder.hh index 195f24c..98b5f70 100644 --- a/milena/apps/morphers/recorder.cc +++ b/milena/apps/morphers/recorder.hh @@ -23,38 +23,33 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#ifndef APPS_MORPHERS_RECORDER_HH +# define APPS_MORPHERS_RECORDER_HH + /// \file /// \brief Morpher recording every change in the morphed image. /// -/// To produce an AVI movie from the `lena-fill*.ppm' files, use: -/// -/// for f in lena-fill*ppm; convert $f -scale 2500% $(basename $f .ppm).png -/// mencoder "mf://lena-fill*.png" -o lena-fill.avi -ovc lavc -lavcopts vcodec=mjpeg -/// -/// The output `lena-fill.avi' can be embedded in a PDF file. */ +/// \todo Split and move this into the library? #include <sstream> #include <iomanip> #include <string> -#include <mln/core/image/image2d.hh> #include <mln/core/image/imorph/decorated_image.hh> #include <mln/value/rgb8.hh> #include <mln/core/routine/duplicate.hh> -#include <mln/literal/colors.hh> -#include <mln/data/fill.hh> - -#include <mln/io/ppm/all.hh> +#include <mln/io/ppm/save.hh> #include "apps/data.hh" // FIXME: mln::decorated_image lacks a proper definition of -// properties! (see mln/core/image/imorph/decorated_image.hh +// properties! (see mln/core/image/imorph/decorated_image.hh). We use +// the following (minimal) set of properties as a workaround. namespace mln { @@ -118,18 +113,4 @@ namespace ppm } } - -int main() -{ - using namespace mln; - using mln::value::rgb8; - - typedef image2d<rgb8> I; - I lena = io::ppm::load<rgb8>(MLN_IMG_DIR "/tiny.ppm"); - decorated_image< I, recorder > lena_rec = record(lena); - /* FIXME: Cheat: use generic fill as mln::decorated_image does not - define properly its properties. */ - data::impl::generic::fill_with_value(lena_rec, - literal::green); - ppm::save(lena_rec, "lena-fill"); -} +#endif // ! APPS_MORPHERS_RECORDER_HH -- 1.7.2.5

1 0

branch apps-morphers created: olena-2.0-10-g6b931cc
by git＠lrde.epita.fr 18 Nov '11

18 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch apps-morphers has been created at 6b931cc6d218c25448e7bf3479c98c16acd7daa1 (commit) - Log ----------------------------------------------------------------- 6b931cc configure.ac: Configure milena/apps/morphers/Makefile. 1e58a78 Add examples of morphers. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch unstable/scribo updated: olena-2.0-17-gb340c52
by lazzara＠lrde.epita.fr 16 Nov '11

16 Nov '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via b340c526ae583ce7be9ea28b63bf98f25aae1add (commit) via 3b03179e7f4d5bd9354bdfbcc897dfd47968fe05 (commit) from 6982d67f5d2c708ed42648e039ad0b1cfcc959ab (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 ----------------------------------------------------------------- b340c52 m4/oln-with-lib.m4: Lookup for multiple AND single libraries while checking Tesseract availability. 3b03179 scribo/text/recognition.hh: Fix code for Tesseract 3.01 compatibility. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ m4/oln-with-lib.m4 | 28 ++++++++++++++++++---------- scribo/ChangeLog | 5 +++++ scribo/scribo/text/recognition.hh | 4 ++-- 4 files changed, 30 insertions(+), 12 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-17-gb340c52 m4/oln-with-lib.m4: Lookup for multiple AND single libraries while checking Tesseract availability.
by Guillaume Lazzara 16 Nov '11

16 Nov '11

--- ChangeLog | 5 +++++ m4/oln-with-lib.m4 | 28 ++++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b385e9c..87c0702 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * m4/oln-with-lib.m4: Lookup for multiple AND single libraries + while checking Tesseract availability. + 2011-09-16 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac, NEWS: Version 2.0a. diff --git a/m4/oln-with-lib.m4 b/m4/oln-with-lib.m4 index 59c6e16..a59acf0 100644 --- a/m4/oln-with-lib.m4 +++ b/m4/oln-with-lib.m4 @@ -1,7 +1,7 @@ # -*- Autoconf -*- -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE) +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -83,19 +83,27 @@ AC_DEFUN([OLN_WITH_TESSERACT], TESSERACT_LDFLAGS='' if test "x$with_tesseract" != xno; then - # Checking for Tesseract 3.x - _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract_api], + # Checking for Tesseract 3.x (single lib) + _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract], [tesseract], [TESSERACT_3], []) if test x$oln_have_tesseract != xyes; then - # Tesseract 2.x not found, checking for Tesseract 2.x - _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract_full], + # Checking for Tesseract 3.x (multiple lib) + _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract_api], + [tesseract], [TESSERACT_3], []) + if test x$oln_have_tesseract != xyes; then + # Tesseract 3.x not found, checking for Tesseract 2.x + _OLN_WITH_LIB_SHARED_IMPL([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], [TESSERACT_2], []) - TESSERACT_CPPFLAGS="$TESSERACT_2_CPPFLAGS -DHAVE_TESSERACT_2" - TESSERACT_LDFLAGS=$TESSERACT_2_LDFLAGS + TESSERACT_CPPFLAGS="$TESSERACT_2_CPPFLAGS -DHAVE_TESSERACT_2" + TESSERACT_LDFLAGS=$TESSERACT_2_LDFLAGS + else + TESSERACT_CPPFLAGS="$TESSERACT_3_CPPFLAGS -DHAVE_TESSERACT_3" + TESSERACT_LDFLAGS=$TESSERACT_3_LDFLAGS + fi else - TESSERACT_CPPFLAGS="$TESSERACT_3_CPPFLAGS -DHAVE_TESSERACT_3" - TESSERACT_LDFLAGS=$TESSERACT_3_LDFLAGS + TESSERACT_CPPFLAGS="$TESSERACT_3_CPPFLAGS -DHAVE_TESSERACT_3" + TESSERACT_LDFLAGS=$TESSERACT_3_LDFLAGS fi fi -- 1.7.2.5

1 0

olena-2.0-16-g3b03179 scribo/text/recognition.hh: Fix code for Tesseract 3.01 compatibility.
by Guillaume Lazzara 16 Nov '11

16 Nov '11

--- scribo/ChangeLog | 5 +++++ scribo/scribo/text/recognition.hh | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6381a60..07a1a29 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2011-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/text/recognition.hh: Fix code for Tesseract 3.01 + compatibility. + 2011-10-17 Guillaume Lazzara <z(a)lrde.epita.fr> Move Otsu's threshold computation in a separate routine. diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 1e11a3e..b7e5c91 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -112,7 +112,7 @@ namespace scribo TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); # else // HAVE_TESSERACT_3 tesseract::TessBaseAPI tess; - if (tess.Init(NULL, language, NULL, 0, false) == -1) + if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) { std::cout << "Error: cannot initialize tesseract!" << std::endl; abort(); @@ -220,7 +220,7 @@ namespace scribo TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); # else // HAVE_TESSERACT_3 tesseract::TessBaseAPI tess; - if (tess.Init(NULL, language, NULL, 0, false) == -1) + if (tess.Init(NULL, language, tesseract::OEM_DEFAULT) == -1) { std::cout << "Error: cannot initialize tesseract!" << std::endl; abort(); -- 1.7.2.5

1 0

olena-2.0-14-g520e734 mln/core/image/dmorph/slice_image.hh: Add operator=() for image2d.
by Guillaume Lazzara 16 Nov '11

16 Nov '11

--- milena/ChangeLog | 5 +++++ milena/mln/core/image/dmorph/slice_image.hh | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 04bac84..5ee2282 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2011-10-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/image/dmorph/slice_image.hh: Add operator=() for + image2d. + 2011-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/io/dicom/load.hh: Fix memory leak. diff --git a/milena/mln/core/image/dmorph/slice_image.hh b/milena/mln/core/image/dmorph/slice_image.hh index b751758..a5e2983 100644 --- a/milena/mln/core/image/dmorph/slice_image.hh +++ b/milena/mln/core/image/dmorph/slice_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -34,7 +35,8 @@ # include <mln/core/internal/image_domain_morpher.hh> # include <mln/core/alias/box3d.hh> -# include <mln/core/alias/box2d.hh> +# include <mln/core/image/image2d.hh> +# include <mln/data/paste.hh> namespace mln @@ -107,6 +109,8 @@ namespace mln void init_(I& ima, def::coord sli); + template <typename V> + void operator=(const image2d<V>& rhs); /// Give the definition domain. const box2d& domain() const; @@ -211,6 +215,14 @@ namespace mln } template <typename I> + template <typename V> + void + slice_image::operator=(const image2d<V>& rhs) + { + data::paste(rhs, *this); + } + + template <typename I> inline const box2d& slice_image::domain() const -- 1.7.2.5

1 0

olena-2.0-13-g8cef823 Move Otsu's threshold computation in a separate routine.
by Guillaume Lazzara 16 Nov '11

16 Nov '11

* scribo/binarization/otsu.hh, * scribo/binarization/otsu_threshold.hh: Move threshold computation in a separate routine. --- scribo/ChangeLog | 8 +++ scribo/scribo/binarization/otsu.hh | 56 +------------------- .../binarization/{otsu.hh => otsu_threshold.hh} | 31 +++++------ 3 files changed, 23 insertions(+), 72 deletions(-) copy scribo/scribo/binarization/{otsu.hh => otsu_threshold.hh} (84%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0923b28..6381a60 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-10-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Move Otsu's threshold computation in a separate routine. + + * scribo/binarization/otsu.hh, + * scribo/binarization/otsu_threshold.hh: Move threshold + computation in a separate routine. + +2011-10-17 Guillaume Lazzara <z(a)lrde.epita.fr> + Add Niblack's binarization algorithm. * scribo/binarization/all.hh: Update includes. diff --git a/scribo/scribo/binarization/otsu.hh b/scribo/scribo/binarization/otsu.hh index c96a207..6b9d492 100644 --- a/scribo/scribo/binarization/otsu.hh +++ b/scribo/scribo/binarization/otsu.hh @@ -27,12 +27,8 @@ # define SCRIBO_BINARIZATION_OTSU_HH # include <mln/core/concept/image.hh> -# include <mln/util/array.hh> -# include <mln/geom/nsites.hh> -# include <mln/geom/ncols.hh> -# include <mln/geom/nrows.hh> -# include <mln/histo/compute.hh> +# include <scribo/binarization/otsu_threshold.hh> # include <scribo/binarization/global_threshold.hh> namespace scribo @@ -72,55 +68,7 @@ namespace scribo mlc_is_a(mln_value(I), value::Scalar)::check(); // FIXME: Check that input value is gray level. - mln_value(I) maxval = mln_max(mln_value(I)); - unsigned nsites = geom::nsites(input); - - /* Histogram generation */ - histo::array<mln_value(I)> hist = mln::histo::compute(input); - - - /* calculation of probability density */ - util::array<double> pdf(hist.nvalues()); //probability distribution - for(int i = 0; i< maxval; ++i) - pdf[i] = (double)hist[i] / nsites; - - - util::array<double> cdf(hist.nvalues()); //cumulative probability distribution - util::array<double> myu(hist.nvalues()); // mean value for separation - - /* cdf & myu generation */ - cdf[0] = pdf[0]; - myu[0] = 0.0; /* 0.0 times prob[0] equals zero */ - - for(int i = 1; i < maxval; ++i) - { - cdf[i] = cdf[i-1] + pdf[i]; - myu[i] = myu[i-1] + i*pdf[i]; - } - - /* sigma maximization - sigma stands for inter-class variance - and determines optimal threshold value */ - int threshold = 0; - double max_sigma = 0.0; - util::array<double> sigma(hist.nvalues()); // inter-class variance - - for(int i = 0; i < maxval - 1; ++i) - { - if(cdf[i] != 0.0 && cdf[i] != 1.0) - { - double p1p2 = cdf[i] * (1.0 - cdf[i]); - double mu1mu2diff = myu[maxval - 1] * cdf[i] - myu[i]; - sigma[i] = mu1mu2diff * mu1mu2diff / p1p2; - } - else - sigma[i] = 0.0; - if(sigma[i] > max_sigma) - { - max_sigma = sigma[i]; - threshold = i; - } - } + mln_value(I) threshold = otsu_threshold(input); // Computing final result. mln_ch_value(I,bool) output = global_threshold(input, threshold); diff --git a/scribo/scribo/binarization/otsu.hh b/scribo/scribo/binarization/otsu_threshold.hh similarity index 84% copy from scribo/scribo/binarization/otsu.hh copy to scribo/scribo/binarization/otsu_threshold.hh index c96a207..ab663d0 100644 --- a/scribo/scribo/binarization/otsu.hh +++ b/scribo/scribo/binarization/otsu_threshold.hh @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_BINARIZATION_OTSU_HH -# define SCRIBO_BINARIZATION_OTSU_HH +#ifndef SCRIBO_BINARIZATION_OTSU_THRESHOLD_HH +# define SCRIBO_BINARIZATION_OTSU_THRESHOLD_HH # include <mln/core/concept/image.hh> # include <mln/util/array.hh> @@ -33,8 +33,6 @@ # include <mln/geom/nrows.hh> # include <mln/histo/compute.hh> -# include <scribo/binarization/global_threshold.hh> - namespace scribo { @@ -43,29 +41,28 @@ namespace scribo using namespace mln; - /*! An implementation of Otsu's binarization algorithm. + /*! Compute a global binarization threshold using Otsu's algorithm. It is based on Ocropus's implementation. http://code.google.com/p/ocropus/ \param[in] input A gray-scale image. - \return A binary image. True for foreground, False for - background. + \return A global threshold value. */ template <typename I> - mln_ch_value(I,bool) - otsu(const Image& input); + mln_value(I) + otsu_threshold(const Image& input); # ifndef MLN_INCLUDE_ONLY template <typename I> - mln_ch_value(I,bool) - otsu(const Image& input_) + mln_value(I) + otsu_threshold(const Image& input_) { - trace::entering("scribo::binarization::otsu"); + trace::entering("scribo::binarization::otsu_threshold"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -101,7 +98,7 @@ namespace scribo /* sigma maximization sigma stands for inter-class variance and determines optimal threshold value */ - int threshold = 0; + mln_value(I) threshold = literal::zero; double max_sigma = 0.0; util::array<double> sigma(hist.nvalues()); // inter-class variance @@ -122,10 +119,8 @@ namespace scribo } } - // Computing final result. - mln_ch_value(I,bool) output = global_threshold(input, threshold); - - return output; + trace::exiting("scribo::binarization::otsu_threshold"); + return threshold; } # endif // ! MLN_INCLUDE_ONLY @@ -134,4 +129,4 @@ namespace scribo } // end of namespace scribo -#endif // ! SCRIBO_BINARIZATION_OTSU_HH +#endif // ! SCRIBO_BINARIZATION_OTSU_THRESHOLD_HH -- 1.7.2.5

1 0