Olena-patches February 2014

olena-patches@lrde.epita.fr

3 participants
9 discussions

Start a nNew thread

olena: branch next updated: olena-2.0-847-g7b885b8

by git＠lrde.epita.fr

10 years, 1 month

olena: olena-2.0-847-g7b885b8 Simplify the implementation of mln::fun::vv2v::algebra::vec.

by Roland Levillain

* mln/fun/vv2v/vec.hh (mln::fun::vv2v::algebra::vec::operator()): Here. Fix the documentation. --- milena/ChangeLog | 8 ++++++++ milena/mln/fun/vv2v/vec.hh | 17 ++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 65a3e0e..c0e8e2b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2014-02-24 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify the implementation of mln::fun::vv2v::algebra::vec. + + * mln/fun/vv2v/vec.hh (mln::fun::vv2v::algebra::vec::operator()): + Here. + Fix the documentation. + 2011-01-17 Roland Levillain <roland(a)lrde.epita.fr> * apps/bench/list2table: Generate a shorter table. diff --git a/milena/mln/fun/vv2v/vec.hh b/milena/mln/fun/vv2v/vec.hh index 908d4ff..d77dd9b 100644 --- a/milena/mln/fun/vv2v/vec.hh +++ b/milena/mln/fun/vv2v/vec.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -28,10 +29,11 @@ /// \file /// -/// computing the vecimum of two values using a functor. +/// Forming a vector (mln::algebra::vec) from two values of the same +/// type using a functor. # include <mln/core/concept/function.hh> -# include <mln/algebra/vec.hh> +# include <mln/make/vec.hh> namespace mln @@ -43,9 +45,8 @@ namespace mln namespace vv2v { - // FIXME: Doc. - - /// \brief A functor computing the vecimum of two values. + /// \brief A functor forming a vector (mln::algebra::vec) from + /// two values of the same type. template <typename V> struct vec : public Function_vv2v< vec<V> > { @@ -61,9 +62,7 @@ namespace mln algebra::vec<2,V> vec<V>::operator()(const V& v1, const V& v2) const { - algebra::vec<2,V> tmp; - tmp.set(v1, v2); - return tmp; + return make::vec(v1, v2); } # endif // ! MLN_INCLUDE_ONLY -- 1.7.10.4

10 years, 1 month

olena: branch next updated: olena-2.0-846-g0b465a3

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 0b465a3cf769b7325cf4b4b657821da26f3e55c3 (commit) via a18534726d9ceb4105895bcf7c52ca1f0a0e26c1 (commit) via 091e1bec2cd43f151ce1e24da9020df4fbb89453 (commit) via 55fd2b0c024235e80b002f7e8f4f1d5b0a2b04bd (commit) via 90d29df9acaa72828aacff483b1bded985456fb0 (commit) via b43f22a4c68ab3163fdb56c8a4903c841c2cdb27 (commit) via 27fd9c88f74d43b40f7649d80fa49493236b2e75 (commit) via b368f2680d0e6ee2ed452c13f6dc4795e698191f (commit) via 8adc75d924fa7964d45ca8d93d947d6aaee070ee (commit) via 26be3832a9c1760b591cbc0dcce32570ef46f164 (commit) via a2742cb603295b6e023ce790e2039cc247be162b (commit) via 1f64874f7344f0ee4e0ef77c766ebcbe68b52734 (commit) via f588e466fb62fbc2b4295bcb27ef37f6898dca4b (commit) via 1e7c979fa02896e4434fe2d39453e34cddb00358 (commit) via ccb4093b619c1ebdf4b7a48c64d498c0544ee5ea (commit) via 1681fb5f978ac7ccd4a3a69b6f31fb3f1880601a (commit) via ad8c64bf8a03fa964e6f1423b6f9dcbbfeb82558 (commit) via d9fc1df7b9bb24226d6021597b96cea2d5697c02 (commit) via c8848046367ef57503a3d506329275667f82fdbb (commit) via c17395c573a9613106c3fec0c0a14692a150fcdc (commit) via 3a8816344f96e2743cd2d813d9305d622c064d11 (commit) from bb4a04478ac8fc7125c78ff145b829cba4151156 (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: ChangeLog | 8 + configure.ac | 8 + milena/ChangeLog | 225 +++++++++++++ milena/apps/Makefile.am | 3 + milena/apps/bench/Makefile.am | 117 +++++++ milena/{mln/accu/pair.hh => apps/bench/and_not.hh} | 74 ++-- .../bench/dilation-lena-bench-fast.cc} | 17 +- .../bench/dilation-lena-bench-fast_static.cc} | 36 +- .../bench/dilation-lena-bench-gen.cc} | 17 +- milena/apps/bench/dilation-lena-bench-macros.hh | 96 ++++++ .../bench/dilation-lena-bench-nongen.cc} | 18 +- .../bench/dilation-lena-bench-nongen_2ptr.cc} | 18 +- milena/apps/bench/dilation-lena-table.cc | 194 +++++++++++ milena/apps/bench/dilation-lena.cc | 112 +++++++ milena/apps/bench/dilation-lena.hh | 313 +++++++++++++++++ .../linear/lap.cc => apps/bench/gradient-lena.cc} | 24 +- milena/apps/bench/gradient-spe-lena.cc | 352 ++++++++++++++++++++ milena/apps/bench/lena1024.pgm | 5 + milena/apps/bench/lena2048.pgm | 5 + milena/apps/bench/list2table | 50 +++ milena/{mln/accu/pair.hh => apps/bench/minus.hh} | 73 ++-- milena/apps/bench/static_array.hh | 134 ++++++++ .../bench/static_dpoints_pixter.hh} | 249 +++++++------- .../core/window.hh => apps/bench/static_window.hh} | 296 ++++++++-------- milena/apps/bench/test-dilation-lena-bench.in | 23 ++ .../core/trait/pixter.hh => apps/bench/trait.hh} | 64 ++-- 26 files changed, 2094 insertions(+), 437 deletions(-) create mode 100644 milena/apps/bench/Makefile.am copy milena/{mln/accu/pair.hh => apps/bench/and_not.hh} (74%) copy milena/{tools/simple_point3d_lut_26_6.cc => apps/bench/dilation-lena-bench-fast.cc} (84%) copy milena/{tests/literal/min.cc => apps/bench/dilation-lena-bench-fast_static.cc} (68%) copy milena/{tools/simple_point3d_lut_26_6.cc => apps/bench/dilation-lena-bench-gen.cc} (84%) create mode 100644 milena/apps/bench/dilation-lena-bench-macros.hh copy milena/{tests/value/int_u32.cc => apps/bench/dilation-lena-bench-nongen.cc} (84%) copy milena/{tests/value/int_u32.cc => apps/bench/dilation-lena-bench-nongen_2ptr.cc} (83%) create mode 100644 milena/apps/bench/dilation-lena-table.cc create mode 100644 milena/apps/bench/dilation-lena.cc create mode 100644 milena/apps/bench/dilation-lena.hh copy milena/{tests/linear/lap.cc => apps/bench/gradient-lena.cc} (82%) create mode 100644 milena/apps/bench/gradient-spe-lena.cc create mode 100644 milena/apps/bench/lena1024.pgm create mode 100644 milena/apps/bench/lena2048.pgm create mode 100755 milena/apps/bench/list2table copy milena/{mln/accu/pair.hh => apps/bench/minus.hh} (74%) create mode 100644 milena/apps/bench/static_array.hh copy milena/{mln/core/dpoints_pixter.hh => apps/bench/static_dpoints_pixter.hh} (63%) copy milena/{mln/core/window.hh => apps/bench/static_window.hh} (51%) create mode 100644 milena/apps/bench/test-dilation-lena-bench.in copy milena/{mln/core/trait/pixter.hh => apps/bench/trait.hh} (53%) hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 1 month

olena: branch master updated: olena-2.0-846-g0b465a3

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 master has been updated via 0b465a3cf769b7325cf4b4b657821da26f3e55c3 (commit) via a18534726d9ceb4105895bcf7c52ca1f0a0e26c1 (commit) via 091e1bec2cd43f151ce1e24da9020df4fbb89453 (commit) via 55fd2b0c024235e80b002f7e8f4f1d5b0a2b04bd (commit) via 90d29df9acaa72828aacff483b1bded985456fb0 (commit) via b43f22a4c68ab3163fdb56c8a4903c841c2cdb27 (commit) via 27fd9c88f74d43b40f7649d80fa49493236b2e75 (commit) via b368f2680d0e6ee2ed452c13f6dc4795e698191f (commit) via 8adc75d924fa7964d45ca8d93d947d6aaee070ee (commit) via 26be3832a9c1760b591cbc0dcce32570ef46f164 (commit) via a2742cb603295b6e023ce790e2039cc247be162b (commit) via 1f64874f7344f0ee4e0ef77c766ebcbe68b52734 (commit) via f588e466fb62fbc2b4295bcb27ef37f6898dca4b (commit) via 1e7c979fa02896e4434fe2d39453e34cddb00358 (commit) via ccb4093b619c1ebdf4b7a48c64d498c0544ee5ea (commit) via 1681fb5f978ac7ccd4a3a69b6f31fb3f1880601a (commit) via ad8c64bf8a03fa964e6f1423b6f9dcbbfeb82558 (commit) via d9fc1df7b9bb24226d6021597b96cea2d5697c02 (commit) via c8848046367ef57503a3d506329275667f82fdbb (commit) via c17395c573a9613106c3fec0c0a14692a150fcdc (commit) via 3a8816344f96e2743cd2d813d9305d622c064d11 (commit) via bb4a04478ac8fc7125c78ff145b829cba4151156 (commit) from d2802dad212b143fe86344fc91264f9b87c5c4a3 (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: ChangeLog | 8 + configure.ac | 8 + milena/ChangeLog | 231 ++++++++++++- milena/apps/Makefile.am | 3 + milena/apps/bench/Makefile.am | 117 +++++++ milena/{mln/accu/pair.hh => apps/bench/and_not.hh} | 74 ++-- .../bench/dilation-lena-bench-fast.cc} | 17 +- .../bench/dilation-lena-bench-fast_static.cc} | 36 +- .../bench/dilation-lena-bench-gen.cc} | 17 +- milena/apps/bench/dilation-lena-bench-macros.hh | 96 ++++++ .../bench/dilation-lena-bench-nongen.cc} | 18 +- .../bench/dilation-lena-bench-nongen_2ptr.cc} | 18 +- milena/apps/bench/dilation-lena-table.cc | 194 +++++++++++ milena/apps/bench/dilation-lena.cc | 112 +++++++ milena/apps/bench/dilation-lena.hh | 313 +++++++++++++++++ .../linear/lap.cc => apps/bench/gradient-lena.cc} | 24 +- milena/apps/bench/gradient-spe-lena.cc | 352 ++++++++++++++++++++ milena/apps/bench/lena1024.pgm | 5 + milena/apps/bench/lena2048.pgm | 5 + milena/apps/bench/list2table | 50 +++ milena/{mln/accu/pair.hh => apps/bench/minus.hh} | 73 ++-- milena/apps/bench/static_array.hh | 134 ++++++++ .../bench/static_dpoints_pixter.hh} | 249 +++++++------- .../core/window.hh => apps/bench/static_window.hh} | 296 ++++++++-------- milena/apps/bench/test-dilation-lena-bench.in | 23 ++ .../core/trait/pixter.hh => apps/bench/trait.hh} | 64 ++-- scribo/ChangeLog | 22 +- swilena/ChangeLog | 10 +- 28 files changed, 2113 insertions(+), 456 deletions(-) create mode 100644 milena/apps/bench/Makefile.am copy milena/{mln/accu/pair.hh => apps/bench/and_not.hh} (74%) copy milena/{tools/simple_point3d_lut_26_6.cc => apps/bench/dilation-lena-bench-fast.cc} (84%) copy milena/{tests/literal/min.cc => apps/bench/dilation-lena-bench-fast_static.cc} (68%) copy milena/{tools/simple_point3d_lut_26_6.cc => apps/bench/dilation-lena-bench-gen.cc} (84%) create mode 100644 milena/apps/bench/dilation-lena-bench-macros.hh copy milena/{tests/value/int_u32.cc => apps/bench/dilation-lena-bench-nongen.cc} (84%) copy milena/{tests/value/int_u32.cc => apps/bench/dilation-lena-bench-nongen_2ptr.cc} (83%) create mode 100644 milena/apps/bench/dilation-lena-table.cc create mode 100644 milena/apps/bench/dilation-lena.cc create mode 100644 milena/apps/bench/dilation-lena.hh copy milena/{tests/linear/lap.cc => apps/bench/gradient-lena.cc} (82%) create mode 100644 milena/apps/bench/gradient-spe-lena.cc create mode 100644 milena/apps/bench/lena1024.pgm create mode 100644 milena/apps/bench/lena2048.pgm create mode 100755 milena/apps/bench/list2table copy milena/{mln/accu/pair.hh => apps/bench/minus.hh} (74%) create mode 100644 milena/apps/bench/static_array.hh copy milena/{mln/core/dpoints_pixter.hh => apps/bench/static_dpoints_pixter.hh} (63%) copy milena/{mln/core/window.hh => apps/bench/static_window.hh} (51%) create mode 100644 milena/apps/bench/test-dilation-lena-bench.in copy milena/{mln/core/trait/pixter.hh => apps/bench/trait.hh} (53%) hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 1 month

olena: branch sandbox/anthony updated: olena-2.0-604-g586804e

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 sandbox/anthony has been updated via 586804e8c224af873afe8e13b04b841eb0ae5e22 (commit) from bc40c1bcd0075922ff6620e7f51397abc0d79c3d (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 ----------------------------------------------------------------- 586804e [SIFT] Minor fixes ----------------------------------------------------------------------- Summary of changes: milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/opencv/Makefile | 5 +- milena/sandbox/anthony/opencv/main.cpp | 32 +- milena/sandbox/anthony/src/dog-space.hh | 690 +++++++++++++++-------------- milena/sandbox/anthony/src/main.cc | 48 +- milena/sandbox/anthony/src/scale-space.hh | 21 +- 6 files changed, 412 insertions(+), 386 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 1 month

olena: olena-2.0-604-g586804e [SIFT] Minor fixes

by Anthony Seure

--- milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/opencv/Makefile | 5 +- milena/sandbox/anthony/opencv/main.cpp | 32 +- milena/sandbox/anthony/src/dog-space.hh | 690 +++++++++++++++-------------- milena/sandbox/anthony/src/main.cc | 48 +- milena/sandbox/anthony/src/scale-space.hh | 21 +- 6 files changed, 412 insertions(+), 386 deletions(-) diff --git a/milena/sandbox/anthony/Makefile b/milena/sandbox/anthony/Makefile index 44edf3b..edd3807 100644 --- a/milena/sandbox/anthony/Makefile +++ b/milena/sandbox/anthony/Makefile @@ -1,4 +1,4 @@ -CCACHE= +CCACHE=ccache CC=g++ CFLAGS=-Wall -Wextra CLIBS=-I../../ diff --git a/milena/sandbox/anthony/opencv/Makefile b/milena/sandbox/anthony/opencv/Makefile index 8e438f0..d9a8be4 100644 --- a/milena/sandbox/anthony/opencv/Makefile +++ b/milena/sandbox/anthony/opencv/Makefile @@ -2,7 +2,7 @@ CCACHE= CXX=clang++ SRC=main.cpp LIBS=-L/usr/local/include -lopencv_highgui -lopencv_core -lopencv_features2d -lopencv_nonfree -D_GNU_SOURCE -OUTPUT=cv +OUTPUT=a.out CLEAN=${OUTPUT} *.jpg all: cv @@ -10,6 +10,9 @@ all: cv cv: ${CCACHE} ${CXX} -O3 ${LIBS} ${SRC} -o ${OUTPUT} +pyramid: + ${CCACHE} ${CXX} -O3 ${LIBS} pyramid.cpp -o ${OUTPUT} + debug: ${CCACHE} ${CXX} -g -ggdb -O0 ${LIBS} ${SRC} -o ${OUTPUT} diff --git a/milena/sandbox/anthony/opencv/main.cpp b/milena/sandbox/anthony/opencv/main.cpp index 2de37c1..a7e5713 100644 --- a/milena/sandbox/anthony/opencv/main.cpp +++ b/milena/sandbox/anthony/opencv/main.cpp @@ -10,14 +10,30 @@ // MAIN ENTRY POINT int main(int argc, char* argv[]) { - const cv::Mat input = cv::imread("../images/keith.pbm"); - cv::SiftFeatureDetector detector; - std::vector<cv::KeyPoint> keypoints; - detector.detect(input, keypoints); - - cv::Mat output; - cv::drawKeypoints(input, keypoints, output); - cv::imwrite("sift.jpg", output); + const cv::Mat input1 = cv::imread("../images/keith.pbm"); + const cv::Mat input2 = cv::imread("../images/tshirt.pgm"); + + { + cv::SiftFeatureDetector detector; + std::vector<cv::KeyPoint> keypoints; + detector.detect(input1, keypoints); + std::cout << keypoints.size() << std::endl; + + cv::Mat output; + cv::drawKeypoints(input1, keypoints, output); + cv::imwrite("sift1.jpg", output); + } + + { + cv::SiftFeatureDetector detector; + std::vector<cv::KeyPoint> keypoints; + detector.detect(input2, keypoints); + std::cout << keypoints.size() << std::endl; + + cv::Mat output; + cv::drawKeypoints(input2, keypoints, output); + cv::imwrite("sift2.jpg", output); + } return 0; diff --git a/milena/sandbox/anthony/src/dog-space.hh b/milena/sandbox/anthony/src/dog-space.hh index da35820..9c4fee9 100644 --- a/milena/sandbox/anthony/src/dog-space.hh +++ b/milena/sandbox/anthony/src/dog-space.hh @@ -12,6 +12,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/literal/all.hh> #include <mln/value/int_s16.hh> +#include <mln/value/int_u8.hh> #include "scale-space.hh" #include "keypoint.hh" @@ -22,377 +23,384 @@ using namespace mln; template<typename I, typename S> class DoGSpace : protected ScaleSpace<S> { - public: - DoGSpace(ScaleSpace* _ss) + public: + DoGSpace(ScaleSpace* ss) + : ss_(ss) + { /* NOTHING */ } + + ~DoGSpace() + { + ScaleSpace<S>::~ScaleSpace(); + } + + void build(void) + { + ScaleSpace<S>::o = ss_->octave_count(); + ScaleSpace<S>::g = ss_->gradient_count() - 1; + + typedef typename std::vector< std::vector >::iterator PIT; + typedef typename std::vector::iterator IIT; + + std::vector< std::vector > sspyramid = ss_->getPyramid(); + S dog; + + for (PIT pit = sspyramid.begin(); pit != sspyramid.end(); ++pit) + { + std::vector<S> octave; + for (IIT iit = pit->begin(); (iit + 1) != pit->end(); ++iit) { - ss = _ss; - } + initialize(dog, *iit); + mln_piter(I) p(iit->domain()); - ~DoGSpace() - { - ScaleSpace<S>::~ScaleSpace(); - } + for_all(p) + { + value::int_u8 up = (*iit)(p); + value::int_u8 down = (*(iit+1))(p); - void build(void) + dog(p) = static_cast<value::int_s16>(up) - static_cast<value::int_s16>(down); + } + octave.push_back(dog); + } + ScaleSpace<S>::pyramid.push_back(octave); + } + } + + void findKeypoints(std::list<Keypoint>& keypoints) + { + typedef typename std::vector< std::vector<S> >::iterator PIT; + typedef typename std::vector<S>::iterator IIT; + + unsigned octave = 0; + for (PIT pit = ScaleSpace<S>::pyramid.begin(); pit != ScaleSpace<S>::pyramid.end(); ++pit) + { + unsigned gradient = 1; + for (IIT iit = pit->begin() + 1; (iit + 1) != pit->end(); ++iit) { - ScaleSpace<S>::o = ss->octave_count(); - ScaleSpace<S>::g = ss->gradient_count() - 1; + S upper = *(iit-1); + S current = *iit; + S lower = *(iit+1); - typedef typename std::vector< std::vector >::iterator PIT; - typedef typename std::vector::iterator IIT; + mln_piter(I) p(current.domain()); - std::vector< std::vector > sspyramid = ss->getPyramid(); - S dog; + for_all(p) + { + value::int_s16 center = current(p); + value::int_s16 min = 255; + value::int_s16 max = -256; + mln_niter(neighb2d) n(c8(), p); - for (PIT pit = sspyramid.begin(); pit != sspyramid.end(); ++pit) + int extrema = isExtrema(current, center, n); + + if (extrema == -1) // Is a minimum { - std::vector<S> octave; - for (IIT iit = pit->begin(); (iit + 1) != pit->end(); ++iit) - { - initialize(dog, *iit); - mln_piter(I) p(iit->domain()); - - for_all(p) - { - value::int_s16 up = (value::int_s16) (*iit)(p); - value::int_s16 down = (value::int_s16) (*(iit+1))(p); - value::int_s16 diff = down - up; - //value::int_s16 diff = ( (int) (*iit)(p) ) - ( (int) ((*(iit+1))(p)) ); - - //std::cout << up << " - " << down << " = " << diff << std::endl; - - dog(p) = diff; - } - octave.push_back(dog); - } - ScaleSpace<S>::pyramid.push_back(octave); + findMin(min, lower, upper, p, n); + if (center < min) + keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, false)); } - } - - void findKeypoints(std::list<Keypoint>& keypoints) - { - typedef typename std::vector< std::vector<S> >::iterator PIT; - typedef typename std::vector<S>::iterator IIT; - - unsigned octave = 0; - for (PIT pit = ScaleSpace<S>::pyramid.begin(); pit != ScaleSpace<S>::pyramid.end(); ++pit) + else if (extrema == 1) // Is a maximum { - unsigned gradient = 1; - for (IIT iit = pit->begin() + 1; (iit + 1) != pit->end(); ++iit) - { - S upper = *(iit-1); - S current = *iit; - S lower = *(iit+1); - - mln_piter(I) p(current.domain()); - - for_all(p) - { - value::int_s16 center = current(p); - value::int_s16 min = 255; - value::int_s16 max = -256; - mln_niter(neighb2d) n(c8(), p); - - int extrema = isExtrema(current, center, n); - - if (extrema == -1) // Is a minimum - { - findMin(min, lower, upper, p, n); - if (center < min) - keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, false)); - } - else if (extrema == 1) // Is a maximum - { - findMax(max, lower, upper, p, n); - if (center > max) - keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, true)); - } - } - - ++gradient; - } - - ++octave; + findMax(max, lower, upper, p, n); + if (center > max) + keypoints.push_back(Keypoint(p.col(), p.row(), octave, gradient, true)); } + } + + ++gradient; } - void discardLowContrastKeypoints(std::list<Keypoint>& keypoints) + ++octave; + } + } + + void discardLowContrastKeypoints(std::list<Keypoint>& keypoints) + { + const static unsigned max_interpolation_depth = 5; + unsigned count = 0; + bool enough = false; + std::list<Keypoint>::iterator k = keypoints.begin(); + std::list<Keypoint>::iterator end = keypoints.end(); + Matrix* offset = NULL; + Matrix* previous_offset = NULL; + + while (k != end) + { + while (!enough && count < max_interpolation_depth) { - const static unsigned max_interpolation_depth = 5; - unsigned count = 0; - bool enough = false; - std::list<Keypoint>::iterator k = keypoints.begin(); - Matrix* offset = NULL; - Matrix* previous_offset = NULL; - - while (k != keypoints.end()) + unsigned octave = k->getOctave(); + unsigned gradient = k->getGradient(); + S dog = ScaleSpace<S>::pyramid[octave][gradient]; + S dog_up = ScaleSpace<S>::pyramid[octave][gradient + 1]; + S dog_down = ScaleSpace<S>::pyramid[octave][gradient - 1]; + int col = k->getX(); + int row = k->getY(); + + if (row < 0 || col < 0 + || static_cast<unsigned>(row) >= dog.nrows() + || static_cast<unsigned>(col) >= dog.ncols()) + { + count = max_interpolation_depth; + break; + } + + /* Set the neighbors of the current level: + * n5 n1 n6 + * n2 p n3 + * n7 n4 n8 + */ + float p = dog(mln_psite(S)(row, col)); + + float n1 = dog(mln_psite(S)(row - 1, col)); + float n2 = dog(mln_psite(S)(row, col - 1)); + float n3 = dog(mln_psite(S)(row, col + 1)); + float n4 = dog(mln_psite(S)(row + 1, col)); + + float n5 = dog(mln_psite(S)(row - 1, col - 1)); + float n6 = dog(mln_psite(S)(row - 1, col + 1)); + float n7 = dog(mln_psite(S)(row + 1, col - 1)); + float n8 = dog(mln_psite(S)(row + 1, col + 1)); + + /* Set the neighbors of the upper level: + * u1 + * u2 u u3 + * u4 + */ + float u = dog_up(mln_psite(S)(row, col)); + float u1 = dog_up(mln_psite(S)(row - 1, col)); + float u2 = dog_up(mln_psite(S)(row, col - 1)); + float u3 = dog_up(mln_psite(S)(row, col + 1)); + float u4 = dog_up(mln_psite(S)(row + 1, col)); + + /* Set the neighbors of the lower level: + * l1 + * l2 l l3 + * l4 + */ + float l = dog_down(mln_psite(S)(row, col)); + float l1 = dog_down(mln_psite(S)(row - 1, col)); + float l2 = dog_down(mln_psite(S)(row, col - 1)); + float l3 = dog_down(mln_psite(S)(row, col + 1)); + float l4 = dog_down(mln_psite(S)(row + 1, col)); + + // Compute the offset + + float dxx = n3 - 2.0 * p + n2; + float dyy = n4 - 2.0 * p + n1; + float dss = u - 2.0 * p + l; + + float dxy = (n8 - n6 - n7 + n5) / 4.0; + float dxs = (u3 - u2 - l3 + l2) / 4.0; + float dys = (u4 - u1 - l4 + l1) / 4.0; + + Matrix m1(3, 1); + m1.initialize(); + m1.set(0, 0, n3 - n2); + m1.set(1, 0, n4 - n1); + m1.set(2, 0, u - l); + + Matrix m2(3, 3); + m2.initialize(); + m2.set(0, 0, dxx); m2.set(0, 1, dxy); m2.set(0, 2, dxs); + m2.set(1, 0, dxy); m2.set(1, 1, dyy); m2.set(1, 2, dys); + m2.set(2, 0, dxs); m2.set(2, 1, dys); m2.set(2, 2, dss); + + previous_offset = offset; + offset = m2.solve3x3(m1); + + if (offset == NULL) + { + offset = previous_offset; + enough = true; + } + else + { + if (std::abs(offset->get(0,0)) > 0.5 || + std::abs(offset->get(1,0)) > 0.5 || + std::abs(offset->get(2,0)) > 0.5) { - while (!enough && count < max_interpolation_depth) - { - std::cout << "test1" << std::endl; - unsigned octave = k->getOctave(); - unsigned gradient = k->getGradient(); - S dog = ScaleSpace<S>::pyramid[octave][gradient]; - S dog_up = ScaleSpace<S>::pyramid[octave][gradient + 1]; - S dog_down = ScaleSpace<S>::pyramid[octave][gradient - 1]; - unsigned col = k->getX(); - unsigned row = k->getY(); - std::cout << "test2" << std::endl; - - /* Set the neighbors of the current level: - * n5 n1 n6 - * n2 p n3 - * n7 n4 n8 - */ - float p = dog(mln_psite(S)(row, col)); - - float n1 = dog(mln_psite(S)(row - 1, col)); - float n2 = dog(mln_psite(S)(row, col - 1)); - float n3 = dog(mln_psite(S)(row, col + 1)); - float n4 = dog(mln_psite(S)(row + 1, col)); - - float n5 = dog(mln_psite(S)(row - 1, col - 1)); - float n6 = dog(mln_psite(S)(row - 1, col + 1)); - float n7 = dog(mln_psite(S)(row + 1, col - 1)); - float n8 = dog(mln_psite(S)(row + 1, col + 1)); - - /* Set the neighbors of the upper level: - * u1 - * u2 u u3 - * u4 - */ - float u = dog_up(mln_psite(S)(row, col)); - float u1 = dog_up(mln_psite(S)(row - 1, col)); - float u2 = dog_up(mln_psite(S)(row, col - 1)); - float u3 = dog_up(mln_psite(S)(row, col + 1)); - float u4 = dog_up(mln_psite(S)(row + 1, col)); - - /* Set the neighbors of the lower level: - * l1 - * l2 l l3 - * l4 - */ - float l = dog_down(mln_psite(S)(row, col)); - float l1 = dog_down(mln_psite(S)(row - 1, col)); - float l2 = dog_down(mln_psite(S)(row, col - 1)); - float l3 = dog_down(mln_psite(S)(row, col + 1)); - float l4 = dog_down(mln_psite(S)(row + 1, col)); - - // Compute the offset - - float dxx = n3 - 2.0 * p + n2; - float dyy = n4 - 2.0 * p + n1; - float dss = u - 2.0 * p + l; - - float dxy = (n8 - n6 - n7 + n5) / 4.0; - float dxs = (u3 - u2 - l3 + l2) / 4.0; - float dys = (u4 - u1 - l4 + l1) / 4.0; - - std::cout << "test3" << std::endl; - Matrix m1(3, 1); - m1.initialize(); - m1.set(0, 0, n3 - n2); - m1.set(1, 0, n4 - n1); - m1.set(2, 0, u - l); - - Matrix m2(3, 3); - m2.initialize(); - m2.set(0, 0, dxx); m2.set(0, 1, dxy); m2.set(0, 2, dxs); - m2.set(1, 0, dxy); m2.set(1, 1, dyy); m2.set(1, 2, dys); - m2.set(2, 0, dxs); m2.set(2, 1, dys); m2.set(2, 2, dss); - - std::cout << "test4" << std::endl; - previous_offset = offset; - offset = m2.solve3x3(m1); - std::cout << "test5" << std::endl; - - if (offset == NULL) - { - offset = previous_offset; - enough = true; - } - else - { - if (std::abs(offset->get(0,0)) > 0.5 || - std::abs(offset->get(1,0)) > 0.5 || - std::abs(offset->get(2,0)) > 0.5) - { - std::cout << "test51" << std::endl; - ++count; - k->setX(k->getX() + (int) offset->get(0, 0)); - k->setY(k->getX() + (int) offset->get(1, 0)); - k->setGradient(k->getGradient() + (int) offset->get(1, 0)); - - //FIXME Check boundaries - - if (k->getGradient() < 1 || - k->getGradient() >= ScaleSpace<S>::pyramid[0].size() - 1) - count = max_interpolation_depth; // Remove keypoint - } - else - { - std::cout << "test52" << std::endl; - enough = true; - } - } - } - - std::cout << "test6" << std::endl; - if (count >= max_interpolation_depth) - { - std::cout << "test61" << std::endl; - k = keypoints.erase(k); - } - else - { - std::cout << "test62" << std::endl; - unsigned octave = k->getOctave(); - unsigned gradient = k->getGradient(); - - S dog = ScaleSpace<S>::pyramid[octave][gradient]; - S dog_up = ScaleSpace<S>::pyramid[octave][gradient + 1]; - S dog_down = ScaleSpace<S>::pyramid[octave][gradient - 1]; - unsigned col = k->getX(); - unsigned row = k->getY(); - - /* Set the neighbors of the current level: - * n1 - * n2 p n3 - * n4 - */ - float p = dog(mln_psite(S)(row, col)); - - float n1 = dog(mln_psite(S)(row - 1, col)); - float n2 = dog(mln_psite(S)(row, col - 1)); - float n3 = dog(mln_psite(S)(row, col + 1)); - float n4 = dog(mln_psite(S)(row + 1, col)); - - // Set the neighbors of the upper/lower level: - float u = dog_up(mln_psite(S)(row, col)); - float l = dog_down(mln_psite(S)(row, col)); - - Matrix firstOrder(3, 1); - firstOrder.initialize(); - - /************ WARNING ************/ - /* Maybe missing /255 */ - /*********************************/ - - firstOrder.set(0, 0, n3 - n2); - firstOrder.set(1, 0, n4 - n1); - firstOrder.set(2, 0, u - l); - - float product = firstOrder.dotProduct(offset); - float contrast = p + product / 2.0; - - if (contrast < 0.03) - k = keypoints.erase(k); - else - k++; - } - - enough = false; - count = 0; - } - } + ++count; + k->setX(k->getX() + (int) offset->get(0, 0)); + k->setY(k->getX() + (int) offset->get(1, 0)); + k->setGradient(k->getGradient() + (int) offset->get(1, 0)); - void eliminateEdgeResponses(std::list<Keypoint>& keypoints) - { - const static float bound_ratio = 12.1; + //FIXME Check boundaries - for (std::list<Keypoint>::iterator k = keypoints.begin(); - k != keypoints.end(); ++k) + if (k->getGradient() < 1 || + k->getGradient() >= ScaleSpace<S>::pyramid[0].size() - 1) + count = max_interpolation_depth; // Remove keypoint + } + else { - unsigned octave = k->getOctave(); - unsigned gradient = k->getGradient(); - S dog = ScaleSpace<S>::pyramid[octave][gradient]; - unsigned col = k->getX(); - unsigned row = k->getY(); - - /* Set the neighbors: - * n5 n1 n6 - * n2 p n3 - * n7 n4 n8 - */ - float p = dog(mln_psite(S)(row, col)); - - float n1 = dog(mln_psite(S)(row - 1, col)); - float n2 = dog(mln_psite(S)(row, col - 1)); - float n3 = dog(mln_psite(S)(row, col + 1)); - float n4 = dog(mln_psite(S)(row + 1, col)); - - float n5 = dog(mln_psite(S)(row - 1, col - 1)); - float n6 = dog(mln_psite(S)(row - 1, col + 1)); - float n7 = dog(mln_psite(S)(row + 1, col - 1)); - float n8 = dog(mln_psite(S)(row + 1, col + 1)); - - // Set Hessian matrix and find the ratio - - float dxx = n3 - 2.0 * p + n2; - float dyy = n4 - 2.0 * p + n1; - float dxy = (n8 - n6 - n7 + n5) / 4.0; - - float trace = dxx + dyy; - float determinant = dxx * dyy - dxy * dxy; - float ratio = (trace * trace) / determinant; - - if (determinant <= 0 || ratio >= bound_ratio) - keypoints.erase(k); + enough = true; } + } } - virtual void save() + if (count >= max_interpolation_depth) { + k = keypoints.erase(k); } - - private: - ScaleSpace* ss; - - int isExtrema(S& current, value::int_s16& center, - typename neighb2d::fwd_niter n) + else { - bool min = true; - bool max = true; - - for_all(n) - { - min = (min && center < current(n)); - max = (max && center > current(n)); - } - - if (min) - return -1; - else if (max) - return 1; - else - return 0; + unsigned octave = k->getOctave(); + unsigned gradient = k->getGradient(); + + S dog = ScaleSpace<S>::pyramid[octave][gradient]; + S dog_up = ScaleSpace<S>::pyramid[octave][gradient + 1]; + S dog_down = ScaleSpace<S>::pyramid[octave][gradient - 1]; + unsigned col = k->getX(); + unsigned row = k->getY(); + + /* Set the neighbors of the current level: + * n1 + * n2 p n3 + * n4 + */ + float p = dog(mln_psite(S)(row, col)); + + float n1 = dog(mln_psite(S)(row - 1, col)); + float n2 = dog(mln_psite(S)(row, col - 1)); + float n3 = dog(mln_psite(S)(row, col + 1)); + float n4 = dog(mln_psite(S)(row + 1, col)); + + // Set the neighbors of the upper/lower level: + float u = dog_up(mln_psite(S)(row, col)); + float l = dog_down(mln_psite(S)(row, col)); + + Matrix firstOrder(3, 1); + firstOrder.initialize(); + + /************ WARNING ************/ + /* Maybe missing /255 */ + /*********************************/ + + firstOrder.set(0, 0, n3 - n2); + firstOrder.set(1, 0, n4 - n1); + firstOrder.set(2, 0, u - l); + + float product = firstOrder.dotProduct(offset); + float contrast = p + product / 2.0; + + if (contrast < 0.03) + k = keypoints.erase(k); + else + k++; } - void findMin(value::int_s16& min, S& lower, S& upper, - typename S::piter& p, typename neighb2d::fwd_niter& n) + enough = false; + count = 0; + } + } + + void eliminateEdgeResponses(std::list<Keypoint>& keypoints) + { + const static float bound_ratio = 12.1; + std::list<Keypoint>::iterator k = keypoints.begin(); + std::list<Keypoint>::iterator end = keypoints.end(); + + while (k != end) + { + unsigned octave = k->getOctave(); + unsigned gradient = k->getGradient(); + S dog = ScaleSpace<S>::pyramid[octave][gradient]; + int col = k->getX(); + int row = k->getY(); + + if (row < 0 || col < 0 + || static_cast<unsigned>(row) >= dog.nrows() + || static_cast<unsigned>(col) >= dog.ncols()) { - min = (lower(p) < min) ? lower(p) : min; - min = (upper(p) < min) ? upper(p) : min; - - for_all(n) - { - min = (lower(n) < min) ? lower(n) : min; - min = (upper(n) < min) ? upper(n) : min; - } + k = keypoints.erase(k); } - - void findMax(value::int_s16& max, S& lower, S& upper, - typename S::piter& p, typename neighb2d::fwd_niter& n) + else { - max = (lower(p) > max) ? lower(p) : max; - max = (upper(p) > max) ? upper(p) : max; - - for_all(n) - { - max = (lower(n) > max) ? lower(n) : max; - max = (upper(n) > max) ? upper(n) : max; - } + /* Set the neighbors: + * n5 n1 n6 + * n2 p n3 + * n7 n4 n8 + */ + float p = dog(mln_psite(S)(row, col)); + + float n1 = dog(mln_psite(S)(row - 1, col)); + float n2 = dog(mln_psite(S)(row, col - 1)); + float n3 = dog(mln_psite(S)(row, col + 1)); + float n4 = dog(mln_psite(S)(row + 1, col)); + + float n5 = dog(mln_psite(S)(row - 1, col - 1)); + float n6 = dog(mln_psite(S)(row - 1, col + 1)); + float n7 = dog(mln_psite(S)(row + 1, col - 1)); + float n8 = dog(mln_psite(S)(row + 1, col + 1)); + + // Set Hessian matrix and find the ratio + + float dxx = n3 - 2.0 * p + n2; + float dyy = n4 - 2.0 * p + n1; + float dxy = (n8 - n6 - n7 + n5) / 4.0; + + float trace = dxx + dyy; + float determinant = dxx * dyy - dxy * dxy; + float ratio = (trace * trace) / determinant; + + if (determinant <= 0 || ratio >= bound_ratio) + k = keypoints.erase(k); + else + ++k; } + } + } + + virtual void save() + { + ScaleSpace<S>::save("dogs-o"); + } + + private: + ScaleSpace* ss_; + + int isExtrema(S& current, value::int_s16& center, + typename neighb2d::fwd_niter n) + { + bool min = true; + bool max = true; + + for_all(n) + { + min = (min && center < current(n)); + max = (max && center > current(n)); + } + + if (min) + return -1; + else if (max) + return 1; + else + return 0; + } + + void findMin(value::int_s16& min, S& lower, S& upper, + typename S::piter& p, typename neighb2d::fwd_niter& n) + { + min = (lower(p) < min) ? lower(p) : min; + min = (upper(p) < min) ? upper(p) : min; + + for_all(n) + { + min = (lower(n) < min) ? lower(n) : min; + min = (upper(n) < min) ? upper(n) : min; + } + } + + void findMax(value::int_s16& max, S& lower, S& upper, + typename S::piter& p, typename neighb2d::fwd_niter& n) + { + max = (lower(p) > max) ? lower(p) : max; + max = (upper(p) > max) ? upper(p) : max; + + for_all(n) + { + max = (lower(n) > max) ? lower(n) : max; + max = (upper(n) > max) ? upper(n) : max; + } + } }; #endif /* ! DOG_SPACE_HH */ diff --git a/milena/sandbox/anthony/src/main.cc b/milena/sandbox/anthony/src/main.cc index 5cf4860..a9dd1df 100644 --- a/milena/sandbox/anthony/src/main.cc +++ b/milena/sandbox/anthony/src/main.cc @@ -22,58 +22,52 @@ int main(void) typedef image2d<value::int_s16> S; typedef image2d<value::rgb8> C; - // General parameters - std::string source("images/keith.pbm"); - const unsigned blur_level = 5; - const unsigned octave_level = 4; + std::string source("images/tshirt.pgm"); + const unsigned blur_level = 3; + const unsigned octave_level = 6; ScaleSpace *ss = new ScaleSpace(octave_level, blur_level); DoGSpace<I, S>* dogs = new DoGSpace<I, S>(ss); std::list<Keypoint> keypoints; I original; - C extrema, extrema_b, - extrema2, extrema2_b; - //improved, improved_b; + C extrema1, extrema1_b, extrema2, extrema2_b, extrema3, extrema3_b; io::pgm::load(original, source.c_str()); - initialize(extrema_b, original); + initialize(extrema1_b, original); initialize(extrema2_b, original); - //initialize(improved_b, original); + initialize(extrema3_b, original); - extrema = data::convert(value::rgb8(), original); + extrema1 = data::convert(value::rgb8(), original); extrema2 = data::convert(value::rgb8(), original); - //improved = data::convert(value::rgb8(), original); + extrema3 = data::convert(value::rgb8(), original); // Localization ss->build(original); - //ss->save(); + ss->save(); dogs->build(); - //dogs->save(); - dogs->findKeypoints(keypoints); + dogs->save(); - writeKeypoints(keypoints, extrema, extrema_b); + dogs->findKeypoints(keypoints); + writeKeypoints(keypoints, extrema1, extrema1_b); + std::cout << "Keypoints.size " << keypoints.size() << std::endl; - std::cout << "BEFORE: Low contrast discarding: " << keypoints.size() << std::endl; dogs->discardLowContrastKeypoints(keypoints); - std::cout << "AFTER: Low contrast discarding: " << keypoints.size() << std::endl; - - std::cout << "BEFORE: Elimination of edge responses: " << keypoints.size() << std::endl; - //dogs->eliminateEdgeResponses(keypoints); - std::cout << "AFTER: Elimination of edge responses: " << keypoints.size() << std::endl; - writeKeypoints(keypoints, extrema2, extrema2_b); + std::cout << "Keypoints.size " << keypoints.size() << std::endl; - //writeKeypoints(keypoints, extrema2, extrema2_b); + dogs->eliminateEdgeResponses(keypoints); + writeKeypoints(keypoints, extrema3, extrema3_b); + std::cout << "Keypoints.size " << keypoints.size() << std::endl; // Save - io::ppm::save(extrema, "output/extrema.ppm"); - io::ppm::save(extrema_b, "output/extrema_b.ppm"); + io::ppm::save(extrema1, "output/extrema1.ppm"); + io::ppm::save(extrema1_b, "output/extrema1_b.ppm"); io::ppm::save(extrema2, "output/extrema2.ppm"); io::ppm::save(extrema2_b, "output/extrema2_b.ppm"); - //io::ppm::save(improved, "output/extrema_improved.ppm"); - //io::ppm::save(improved_b, "output/extrema_b_improved.ppm"); + io::ppm::save(extrema3, "output/extrema3.ppm"); + io::ppm::save(extrema3_b, "output/extrema3_b.ppm"); return 0; } diff --git a/milena/sandbox/anthony/src/scale-space.hh b/milena/sandbox/anthony/src/scale-space.hh index e2262b6..d50c07e 100644 --- a/milena/sandbox/anthony/src/scale-space.hh +++ b/milena/sandbox/anthony/src/scale-space.hh @@ -10,6 +10,7 @@ #include <mln/io/ppm/save.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/literal/all.hh> +#include <mln/linear/gaussian.hh> #include <mln/value/int_u8.hh> #include <mln/value/int_s16.hh> @@ -62,7 +63,7 @@ class ScaleSpace } } - void save() + void save(std::string prefix = "ss-o") { std::stringstream name; @@ -70,7 +71,7 @@ class ScaleSpace { for (unsigned j = 0; j < pyramid[i].size(); ++j) { - name << "output/ss-o" << i << "-" << j << ".pgm"; + name << "output/" << prefix < octave; - float variance = sqrt(2); + float sigma = 1.6; + float k = pow(2., 1. / g); - for (unsigned i = 0; i < g; ++i) + octave.push_back(linear::gaussian(original, sigma)); + + for (unsigned i = 1; i < g + 3; ++i) { - blured = blur(original, variance); - variance *= sqrt(2); - octave.push_back(blured); + float sig_prev = pow(k, static_cast<float>(i-1)) * sigma; + float sig_total = sig_prev * k; + float variance = sqrt(sig_total * sig_total - sig_prev * sig_prev); + + octave.push_back(linear::gaussian(original, variance)); } pyramid.push_back(octave); -- 1.7.10.4

10 years, 1 month

olena: branch milena-bench created: olena-2.0-846-g0b465a3

by git＠lrde.epita.fr

10 years, 2 months

olena: branch next updated: olena-2.0-825-gbb4a044

by git＠lrde.epita.fr

10 years, 2 months

olena: olena-2.0-825-gbb4a044 Fix paths in ChangeLogs.

by Roland Levillain

--- milena/ChangeLog | 6 +++--- scribo/ChangeLog | 22 +++++++++++----------- swilena/ChangeLog | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 84cd372..3662dcb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -123,7 +123,7 @@ * common.mk (AM_CPPFLAGS): ...here. Include it... * doc/Makefile.am: ...here, to factor common parts. - * milena/apps/apps.mk: New file. + * apps/apps.mk: New file. Include it... * apps/constrained-connectivity/Makefile.am, * apps/generic-skel/Makefile.am, @@ -465,8 +465,8 @@ * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Display the size of the input. Time the thinning step. - * milena/apps/generic-skel/test-mixed.in, - * milena/apps/mesh-segm-skel/test-mixed.in: + * apps/generic-skel/test-mixed.in, + * apps/mesh-segm-skel/test-mixed.in: New. * apps/generic-skel/Makefile.am (generated_tests): Add test-mixed. (test-mixed): New target. diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7f4e150..2fa24c1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -142,8 +142,8 @@ Display Scribo errors on std::cerr, not std::cout. - * scribo/scribo/text/merging.hh, - * scribo/scribo/text/recognition.hh: + * scribo/text/merging.hh, + * scribo/text/recognition.hh: Here. 2013-08-27 Roland Levillain <roland(a)lrde.epita.fr> @@ -1693,17 +1693,17 @@ Add a better support for different k values in Sauvola Multiscale. - * scribo/scribo/binarization/internal/sauvola_ms_functor.hh, - * scribo/scribo/binarization/sauvola_ms.hh, - * scribo/scribo/binarization/sauvola_ms_split.hh, - * scribo/scribo/toolchain/internal/text_in_doc_preprocess_functor.hh, - * scribo/scribo/toolchain/text_in_doc_preprocess.hh: Make use of + * scribo/binarization/internal/sauvola_ms_functor.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_ms_split.hh, + * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh, + * scribo/toolchain/text_in_doc_preprocess.hh: Make use of k2, k3 and k4 variables. - * scribo/src/binarization/sauvola_ms.cc, - * scribo/src/binarization/sauvola_ms_debug.cc, - * scribo/src/binarization/sauvola_ms_fg.cc, - * scribo/src/binarization/sauvola_ms_split.cc: Fix program + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_debug.cc, + * src/binarization/sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_split.cc: Fix program arguments. 2012-05-11 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 9830d70..fcd4fd9 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -65,11 +65,11 @@ Aesthetic changes in Swilena. - * swilena/box.ixx, - * swilena/box2d.i, - * swilena/image2d.ixx, - * swilena/image2d_point2d.i, - * swilena/morpho.ixx: + * box.ixx, + * box2d.i, + * image2d.ixx, + * image2d_point2d.i, + * morpho.ixx: Here. 2012-08-28 Roland Levillain <roland(a)lrde.epita.fr> -- 1.7.10.4

10 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches February 2014