Olena-patches September 2012

olena-patches@lrde.epita.fr

3 participants
87 discussions

last-svn-commit-557-g7a95539 Get rid of `ltihooks' in Swilena.

by Roland Levillain

* python/ltihooks.py: Remove. * python/Makefile.am (python_PYTHON): Remove ltihooks.py. * python/swilena.py: No longer import `ltihooks'. * run.in: Help Python find actual dynamic modules in directory `.libs', as suggested by Alexandre Duret-Lutz in http://stackoverflow.com/a/5125879/1551751. --- swilena/ChangeLog | 11 ++++++++ swilena/python/Makefile.am | 6 +--- swilena/python/ltihooks.py | 60 -------------------------------------------- swilena/python/swilena.py | 4 +-- swilena/run.in | 46 +++++++++++++++++---------------- 5 files changed, 38 insertions(+), 89 deletions(-) delete mode 100644 swilena/python/ltihooks.py diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 80a0029..b4be5ef 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,14 @@ +2012-07-27 Roland Levillain <roland(a)lrde.epita.fr> + + Get rid of `ltihooks' in Swilena. + + * python/ltihooks.py: Remove. + * python/Makefile.am (python_PYTHON): Remove ltihooks.py. + * python/swilena.py: No longer import `ltihooks'. + * run.in: Help Python find actual dynamic modules in directory + `.libs', as suggested by Alexandre Duret-Lutz in + http://stackoverflow.com/a/5125879/1551751. + 2010-12-03 Roland Levillain <roland(a)lrde.epita.fr> Perform install tests in Swilena. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 3227886..4865755 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -53,10 +53,8 @@ edit = sed \ -e 's|@PYTHON[@]|$(PYTHON)|g' -# ltihooks.py: Python import hooks that understand Libtool libraries. -python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. -python_PYTHON += swilena.py +python_PYTHON = swilena.py # data.py: Access to the data of the distribution (images, meshes, # etc.). diff --git a/swilena/python/ltihooks.py b/swilena/python/ltihooks.py deleted file mode 100644 index 7086365..0000000 --- a/swilena/python/ltihooks.py +++ /dev/null @@ -1,60 +0,0 @@ -# -*- Mode: Python; py-indent-offset: 4 -*- -# ltihooks.py: python import hooks that understand libtool libraries. -# Copyright (C) 2000 James Henstridge. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -import os, ihooks - -class LibtoolHooks(ihooks.Hooks): - def get_suffixes(self): - """Like normal get_suffixes, but adds .la suffixes to list""" - ret = ihooks.Hooks.get_suffixes(self) - ret.insert(0, ('module.la', 'rb', 3)) - ret.insert(0, ('.la', 'rb', 3)) - return ret - - def load_dynamic(self, name, filename, file=None): - """Like normal load_dynamic, but treat .la files specially""" - if len(filename) > 3 and filename[-3:] == '.la': - fp = open(filename, 'r') - dlname = '' - installed = 1 - line = fp.readline() - while line: - if len(line) > 7 and line[:7] == 'dlname=': - dlname = line[8:-2] - elif len(line) > 10 and line[:10] == 'installed=': - installed = line[10:-1] == 'yes' - line = fp.readline() - fp.close() - if dlname: - if installed: - filename = os.path.join(os.path.dirname(filename), - dlname) - else: - filename = os.path.join(os.path.dirname(filename), - '.libs', dlname) - return ihooks.Hooks.load_dynamic(self, name, filename, file) - -importer = ihooks.ModuleImporter() -importer.set_hooks(LibtoolHooks()) - -def install(): - importer.install() -def uninstall(): - importer.uninstall() - -install() diff --git a/swilena/python/swilena.py b/swilena/python/swilena.py index 6538046..c3ac63e 100644 --- a/swilena/python/swilena.py +++ b/swilena/python/swilena.py @@ -1,6 +1,6 @@ #! /usr/bin/env python -# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2012 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -20,8 +20,6 @@ # \file swilena.py # \brief The whole Swilena suite. -import ltihooks - import config from complex2 import * diff --git a/swilena/run.in b/swilena/run.in index 2f01b29..0a76964 100755 --- a/swilena/run.in +++ b/swilena/run.in @@ -1,7 +1,8 @@ -#!/bin/sh -# Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de Paris 6 -# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université -# Pierre et Marie Curie. +#! /bin/sh + +# Copyright (C) 2003, 2004, 2006, 2012 Laboratoire d'Informatique de +# Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC), +# Université Pierre et Marie Curie. # # This file is part of Spot, a model checking library. # @@ -30,28 +31,29 @@ test -n "$srcdir" && test -z "$VERBOSE" && exec >/dev/null 2>&1 # path of dependent libraries in each library). modpath='.libs:@abs_top_builddir@/src/.libs' +# `@abs_builddir@/python' and `@abs_srcdir@/python' are for the *.py +# files, and `@abs_builddir@/python/.libs' for the *.so files. We +# used to rely on a module called `ltihooks' to teach the `import' +# statement how to load a Libtool library, but it started to cause +# issues with Python 2.6. +pypath='@abs_builddir@/python:@abs_builddir@/python/.libs:@abs_srcdir@/python':"$PYTHONPATH" + +# Likewise for Ruby: as some of our SWIG interfaces import other SWIG +# interfaces (with the `%import' keyword), we must add the `.libs' +# directory to SWILENA_RUBY_PATH so that the Ruby interpreter can load +# the corresponding dynamic module(s) (SWIG's `%import' statements +# generate code in dynamic modules that bypass Ruby's `Kernel.require' +# mechanism). +rbpath='@abs_builddir@/ruby:@abs_builddir@/ruby/.libs:@abs_srcdir@/ruby' + case $1 in - '' | *.py) - PYTHONPATH='@abs_builddir@/python:@abs_srcdir@/python':"$PYTHONPATH" \ - DYLD_LIBRARY_PATH=$modpath \ - exec @PYTHON@ "$@" - ;; - # What's the point in adding `.libs' to SWILENA_RUBY_PATH? - # - # As some of our SWIG interfaces import other SWIG interfaces - # (with the `%import' keyword), we must add the `.libs' directory - # to SWILENA_RUBY_PATH so that the Ruby interpreter can load the - # corresponding dynamic module(s) (SWIG's `%import' statements - # generate code in dynamic modules that bypass Ruby's - # `Kernel.require' mechanism). + *.py) + PYTHONPATH=$pypath DYLD_LIBRARY_PATH=$modpath exec @PYTHON@ "$@";; *.rb) - SWILENA_RUBY_PATH='@abs_builddir@/ruby:@abs_srcdir@/ruby:.libs' \ - DYLD_LIBRARY_PATH=$modpath \ - exec @RUBY@ "$@" - ;; + SWILENA_RUBY_PATH=$rbpath DYLD_LIBRARY_PATH=$modpath exec @RUBY@ "$@";; *.test) exec sh -x "$@";; *) - echo "Unknown extension" 2>&1 + echo "Unknown extension" >&2 exit 2;; esac -- 1.7.2.5

11 years, 7 months

olena-2.0-26-ge337270 milena/ChangeLog: Wrap long lines.

by Roland Levillain

--- milena/ChangeLog | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b977679..bdd98f1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -238,7 +238,8 @@ * mln/core/point.hh, * mln/opt/element.hh: Avoid unused variable warning. - * mln/convert/impl/from_image_to_site_set.hh: Remove useless local variable. + * mln/convert/impl/from_image_to_site_set.hh: Remove useless local + variable. 2010-12-10 Roland Levillain <roland(a)lrde.epita.fr> -- 1.7.2.5

11 years, 7 months

branch swilena updated: last-svn-commit-562-ge75f830

by git＠lrde.epita.fr

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 swilena has been updated via e75f830f215145068b6753ed0f809e9975c12431 (commit) via 7c4b3700685e917721d64487afaf1437345e98a3 (commit) via 074a32caf66072e3bc7941f32c81a6a7448b8832 (commit) via e44582470d67b77f69663246eb94f2095414ff40 (commit) via 43b5af6791708f0ef192f35b25e2561139a3b2a0 (commit) via 7a95539131edbe6012cd1a2862ef88f8e67c2f66 (commit) from 601ff8ea39d440417c772e78b814fd2572ff918a (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 ----------------------------------------------------------------- e75f830 Aesthetic changes in Swilena. 7c4b370 Add sps-gdb-local, a script to run the Swilena Python Shell in GDB. 074a32c Fix build dependencies in Swilena. e445824 Comment on an issue of Swilena highlighted by max-tree.py. 43b5af6 Update the local (build-time) Swilena Python Shell. 7a95539 Get rid of `ltihooks' in Swilena. ----------------------------------------------------------------------- Summary of changes: swilena/ChangeLog | 51 +++++++++++++++++++++++++++++++++ swilena/box.ixx | 2 +- swilena/box2d.i | 4 +- swilena/image2d.ixx | 5 ++- swilena/image2d_point2d.i | 2 +- swilena/morpho.ixx | 5 ++- swilena/python/Makefile.am | 19 ++++++------ swilena/python/ltihooks.py | 60 --------------------------------------- swilena/python/max-tree.py | 14 ++++++++- swilena/python/sps-gdb-local.in | 6 ++++ swilena/python/sps-local.in | 2 +- swilena/python/swilena.py | 4 +-- swilena/run.in | 46 +++++++++++++++-------------- 13 files changed, 116 insertions(+), 104 deletions(-) delete mode 100644 swilena/python/ltihooks.py create mode 100644 swilena/python/sps-gdb-local.in hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

branch next updated: olena-2.0-34-gb654f0d

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via b654f0d48265b56eda78f0df27cb1a414f7f7e5a (commit) via e33727052ccf1d6c683cd2492d060ded7fccd7f4 (commit) via d590e49dcb0541a2f964fbbc10032fa3ffcc260b (commit) via 4649bd3bb8ff982893c774075f03d937fe3d995b (commit) via 7cbb3cb04ebbf5b76672a8733629fce9a8cb591b (commit) via 5a934f2c1678ae9bce79836ef2a11f6005e69b7b (commit) via e32d709852606cfc30d2bb673b1fa6042e2b0185 (commit) via 14bf21225e9519b342dbc7eea62ce761f1523d4e (commit) via 75d065e29b6a317d9d4c78ba8d35a214639bb02c (commit) from 39e1152eceddabf1c61e368c2f7bd477dbc2c46e (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 ----------------------------------------------------------------- b654f0d Merge branch 'apps-ismm-2009' into next e337270 milena/ChangeLog: Wrap long lines. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 85 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 28 +- .../papers/levillain.09.ismm/classif-1complex.cc | 307 + .../apps/papers/levillain.09.ismm/classif-graph.cc | 287 + .../apps/papers/levillain.09.ismm/classseedsi.pbm | 6415 ++++++++++++++++++++ milena/apps/papers/levillain.09.ismm/graph.cc | 259 +- .../papers/levillain.09.ismm/influence_zones.hh} | 90 +- milena/apps/papers/levillain.09.ismm/io.hh | 242 + 8 files changed, 7411 insertions(+), 302 deletions(-) create mode 100644 milena/apps/papers/levillain.09.ismm/classif-1complex.cc create mode 100644 milena/apps/papers/levillain.09.ismm/classif-graph.cc create mode 100644 milena/apps/papers/levillain.09.ismm/classseedsi.pbm copy milena/{mln/literal/one.hh => apps/papers/levillain.09.ismm/influence_zones.hh} (55%) create mode 100644 milena/apps/papers/levillain.09.ismm/io.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

olena-2.0-34-gb654f0d Merge branch 'apps-ismm-2009' into next

by Roland Levillain

This is a merge commit message of the following branches: Merge: e337270 d590e49 Conflicts: milena/ChangeLog milena/ChangeLog | 82 + milena/apps/papers/levillain.09.ismm/Makefile.am | 28 +- .../papers/levillain.09.ismm/classif-1complex.cc | 307 + .../apps/papers/levillain.09.ismm/classif-graph.cc | 287 + .../apps/papers/levillain.09.ismm/classseedsi.pbm | 6415 ++++++++++++++++++++ milena/apps/papers/levillain.09.ismm/graph.cc | 259 +- .../papers/levillain.09.ismm/influence_zones.hh | 84 + milena/apps/papers/levillain.09.ismm/io.hh | 242 + 8 files changed, 7451 insertions(+), 253 deletions(-) diff --cc milena/ChangeLog index bdd98f1,295f398..745f38b --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,113 -1,85 +1,195 @@@ + 2011-11-24 Roland Levillain <roland(a)lrde.epita.fr> + + Honor a precondition in classification examples (ISMM 2009). + + * apps/papers/levillain.09.ismm/classif-graph.cc, + * apps/papers/levillain.09.ismm/classif-1complex.cc: + Do not use a value outside the range [0, nbasins] in `canvas_wst' + to prevent a failed precondition in labeling::colorize (when + NDEBUG is not defined). + Reported by David Coeurjolly <david.coeurjolly at liris.cnrs.fr>. + + 2011-10-11 Roland Levillain <roland(a)lrde.epita.fr> + + Graph-based version of the classification example. + + * apps/papers/levillain.09.ismm/classif-graph.cc: New. + * apps/papers/levillain.09.ismm/Makefile.am (noinst_PROGRAMS): + Add classif-graph. + (classif_graph_SOURCES): New. + (noinst_DATA): Add classwst-graph.ppm. + (classwst-graph.ppm): New target. + + 2011-10-10 Roland Levillain <roland(a)lrde.epita.fr> + + Rename apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc: Rename as... + * apps/papers/levillain.09.ismm/classif-1complex.cc: ...this. + * apps/papers/levillain.09.ismm/Makefile.am + (noinst_PROGRAMS, noinst_DATA): s/classif/classif-1complex/. + (classif_SOURCES, classwst.pnm): Replace by... + (classif_1complex_SOURCES, classwst-1complex.ppm): ...these. + + 2011-10-10 Roland Levillain <roland(a)lrde.epita.fr> + + Aesthetic changes in apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc: Here. + Remove useless headers inclusions. + Adjust comments. + + 2011-10-05 Roland Levillain <roland(a)lrde.epita.fr> + + Fix and clean up apps/papers/levillain.09.ismm/classif.cc. + + * apps/papers/levillain.09.ismm/classif.cc (main): Actually use + the chain() routine from chain.hh instead of ad hoc code. + Move code related to the construction of the 1-complex (graph) + image on which the processing chain is run... + (make_complex_image): ...here. + * apps/papers/levillain.09.ismm/Makefile.am (classwst.pnm): Change + the lambda (area) parameter to 4. + + 2011-10-04 Roland Levillain <roland(a)lrde.epita.fr> + + Import the WST-based classification in apps/papers/levillain.09.ismm. + + * apps/papers/levillain.09.ismm/Makefile.am + (noinst_PROGRAMS): Add classif. + (classif_SOURCES): Add classif.cc + (dist_noinst_DATA): Add classseedsi.pbm. + (noinst_DATA): Add classwst.pnm. + (classwst.pnm): New target. + * apps/papers/levillain.09.ismm/classif.cc: New. + Copied and adapted from + sandbox/theo/esiee/laurent/presentation/classif.cc. + * apps/papers/levillain.09.ismm/classseedsi.pbm: New. + + 2011-10-04 Roland Levillain <roland(a)lrde.epita.fr> + + Split apps/papers/levillain.09.ismm/graph.cc. + + * apps/papers/levillain.09.ismm/graph.cc: Misc. changes. + (mln::influence_zones) + (mln::io::neato::save): + Move functions... + * apps/papers/levillain.09.ismm/influence_zones.hh, + * apps/papers/levillain.09.ismm/io.hh: + ...here (new files). + * apps/papers/levillain.09.ismm/Makefile.am (noinst_HEADERS): + Add io.hh and influence_zones.hh + +2011-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix the initialization of all global constants (ticket #43) + + * mln/debug/slices_2d.hh, + * mln/io/dump/get_header.hh, + * mln/io/fld/header.hh, + * mln/io/fld/load.hh, + * mln/io/fld/load_header.hh, + * mln/io/off/load.hh, + * mln/io/off/save.hh, + * mln/math/jacobi.hh, + * mln/morpho/hit_or_miss.hh, + * mln/world/binary_2d/subsample.hh: Add missing 'inline'. + + * tests/Makefile.am (CXXFLAGS): Add -DMLN_WO_GLOBAL_VARS. + + * tests/global_vars1.cc, + * tests/global_vars2.cc: Make take MLN_WO_GLOBAL_VARS into + consideration. + +2011-11-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid minimum value for builtin floating types. (ticket #247) + + * mln/value/builtin/floatings.hh: Here. + + * tests/value/builtin/floatings.cc: write test. + +2011-11-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/fun/v2v/rgb_to_hsl.hh: Fix constructor declaration. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix compilation with multiple files. + + * mln/canvas/browsing/backdiagonal2d.hh, + * mln/canvas/browsing/breadth_first_search.hh, + * mln/canvas/browsing/depth_first_search.hh, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/canvas/browsing/directional.hh, + * mln/canvas/browsing/fwd.hh, + * mln/canvas/browsing/hyper_directional.hh, + * mln/canvas/browsing/snake_fwd.hh, + * mln/canvas/browsing/snake_generic.hh, + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/grays.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/white.hh: Add missing inline keyword and + MLN_WO_GLOBAL_VARS guards. + +2011-11-23 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix more compilation issues with g++ 4.6.1 and clang++. + + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsi_to_rgb.hh, + * mln/fun/v2v/rgb_to_hsi.hh, + * mln/fun/v2v/rgb_to_hsl.hh, + * mln/literal/grays.hh, + * mln/literal/identity.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/zero.hh: Add default constructors. + +2011-11-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix compilation issues with g++ 4.6.1 and clang++. + + * mln/topo/center_only_iter.hh, + * mln/topo/face.hh, + * mln/trait/images.hh, + * mln/convert/from_to.hxx, + * mln/core/image/dmorph/sub_image.hh, + * mln/core/routine/init.hxx, + * mln/algebra/vec.hh: Make declaration and forward declarations + consistent. + + * mln/canvas/browsing/backdiagonal2d.hh, + * mln/canvas/browsing/breadth_first_search.hh, + * mln/canvas/browsing/depth_first_search.hh, + * mln/canvas/browsing/diagonal2d.hh, + * mln/canvas/browsing/dir_struct_elt_incr_update.hh, + * mln/canvas/browsing/directional.hh, + * mln/canvas/browsing/fwd.hh, + * mln/canvas/browsing/hyper_directional.hh, + * mln/canvas/browsing/snake_fwd.hh, + * mln/canvas/browsing/snake_generic.hh, + * mln/canvas/browsing/snake_vert.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/white.hh: Add a default constructor for global + variable types. + + * mln/canvas/browsing/internal/graph_first_search.hh: Avoid a + warning for an unused variable. + + * mln/data/was.median.hh: Fix type of the reference. + 2011-10-04 Roland Levillain <roland(a)lrde.epita.fr> Handle the case of filling an empty border. hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

olena-2.0-78-g100a5de scribo/debug/logger.hh: Fix attributes initialization order.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/scribo/debug/logger.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e18a1c5..669d782 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2012-09-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/debug/logger.hh: Fix attributes initialization order. + 2012-09-07 Guillaume Lazzara <z(a)lrde.epita.fr> Take OCR confidence into account in HTML reconstruction. diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index 9153bf9..a7066d5 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -235,8 +235,8 @@ namespace scribo logger_::logger_() : level_(None), verbose_mode_(Mute), - stream_(std::cerr), - verbose_prefix_("LOG: ") + verbose_prefix_("LOG: "), + stream_(std::cerr) { // Magick::InitializeMagick(0); } -- 1.7.2.5

11 years, 7 months

branch papers/lazzara.12.ijdar updated: olena-2.0-130-gf7985a1

by git＠lrde.epita.fr

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/lazzara.12.ijdar has been updated via f7985a1b13b6492cf8bbbb80ac88fdb3da625005 (commit) via ea5d166701036d0d1e122207eba99e12a0d4bd19 (commit) from 9a4c370d70d77e55335f0edd439ba05ed1b48cc2 (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 ----------------------------------------------------------------- f7985a1 scribo/binarization/sauvola_ms.hh: Add comments. ea5d166 Use io::magick for sauvola binaries output. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 11 +++++++++++ scribo/scribo/binarization/sauvola_ms.hh | 15 +++++++++++++++ scribo/src/binarization/sauvola.cc | 6 +++--- scribo/src/binarization/sauvola_ms.cc | 6 +++--- 4 files changed, 32 insertions(+), 6 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 7 months

branch next updated: olena-2.0-25-g39e1152

by git＠lrde.epita.fr

11 years, 7 months

olena-2.0-130-gf7985a1 scribo/binarization/sauvola_ms.hh: Add comments.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/scribo/binarization/sauvola_ms.hh | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 63ec1b9..615a624 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2012-09-10 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/binarization/sauvola_ms.hh: Add comments. + +2012-09-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Use io::magick for sauvola binaries output. * src/binarization/sauvola.cc, diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 274492d..0bc595e 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -807,6 +807,10 @@ namespace scribo unsigned q = 2; + /*========================== + == Step 1 - Subsampling == + ========================*/ + mln::util::array<I> t_ima; // Make sure t_ima indexes start from 2. @@ -901,6 +905,9 @@ namespace scribo integral_sum_sum_2.border()); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + /*============================================= + == Step 2 - Object selection at each scale == + ===========================================*/ // Highest scale -> no maximum component size. { @@ -954,6 +961,10 @@ namespace scribo mln::debug::filename(internal::scale_image_output)); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + /*============================== + == Step 3 - Results Merging == + ============================*/ + // Propagate scale values. e_2 = transform::influence_zone_geodesic(e_2, c8()); @@ -984,6 +995,10 @@ namespace scribo mln::debug::filename(internal::scale_proba_output)); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG + /*================================= + == Step 4 - Final Binarization == + ===============================*/ + // Binarize image2d<bool> output = internal::multi_scale_binarization(input_1, e_2, t_ima, s); -- 1.7.2.5

11 years, 7 months

olena-2.0-129-gea5d166 Use io::magick for sauvola binaries output.

by Guillaume Lazzara

* src/binarization/sauvola.cc, * src/binarization/sauvola_ms.cc: Here. --- scribo/ChangeLog | 7 +++++++ scribo/src/binarization/sauvola.cc | 6 +++--- scribo/src/binarization/sauvola_ms.cc | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index efcdef1..63ec1b9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2012-09-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use io::magick for sauvola binaries output. + + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc: Here. + 2012-08-23 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Regen. diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index 3549585..d03622d 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -26,7 +26,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> +#include <mln/io/magick/all.hh> #include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -38,7 +38,7 @@ static const scribo::debug::arg_data arg_desc[] = { { "input.*", "An image." }, - { "output.pbm", "A binary image." }, + { "output.*", "A binary image." }, {0, 0} }; @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) scribo::debug::logger().stop_local_time_logging("Binarized in"); - io::pbm::save(out, options.arg("output.pbm")); + io::magick::save(out, options.arg("output.*")); trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index fc6a5a9..970e2aa 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -28,7 +28,7 @@ #include <mln/core/image/image2d.hh> #include <mln/value/int_u8.hh> -#include <mln/io/magick/load.hh> +#include <mln/io/magick/all.hh> #include <mln/io/pbm/save.hh> #include <mln/data/transform.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -41,7 +41,7 @@ static const scribo::debug::arg_data arg_desc[] = { { "input.*", "An image." }, - { "output.pbm", "A binary image." }, + { "output.*", "A binary image." }, {0, 0} }; @@ -147,5 +147,5 @@ int main(int argc, char *argv[]) scribo::debug::logger().stop_local_time_logging("Binarized in"); - io::pbm::save(output, options.arg("output.pbm")); + io::magick::save(output, options.arg("output.*")); } -- 1.7.2.5

11 years, 7 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2012