[Olena-patches] last-svn-commit-686-g3856477 Do not negate Sauvola's output.

* scribo/toolchain/text_in_doc_preprocess.hh, * scribo/toolchain/text_in_picture.hh: Do not negate Sauvola's output anymore. --- scribo/scribo/toolchain/text_in_picture.hh | 37 ++++++++++++++++++---------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/scribo/scribo/toolchain/text_in_picture.hh b/scribo/scribo/toolchain/text_in_picture.hh index 18d3a8e..f5fa5ba 100644 --- a/scribo/scribo/toolchain/text_in_picture.hh +++ b/scribo/scribo/toolchain/text_in_picture.hh @@ -249,21 +249,32 @@ namespace scribo timer_.restart(); mln_ch_value(I,bool) input; - unsigned w = win; - if (!w) - w = std::min(intensity_ima.nrows() / 3, intensity_ima.ncols() / 3); - if (! w % 2) - ++w; - w = std::min(w, conf.sauvola_min_w); - if (multi_scale_bin) - { - std::cout << "** Using sauvola_ms with w_1 = " << w << std::endl; - input = scribo::binarization::sauvola_ms(intensity_ima, w, conf.sauvola_s); - } + + + unsigned w = std::min(intensity_ima.nrows() / 3, intensity_ima.ncols() / 3); + if (win) + input = scribo::binarization::sauvola_ms_split(input_rgb, w, + conf.sauvola_s, 1); else { - std::cout << "** Using sauvola with w_1 = " << w << std::endl; - input = scribo::binarization::sauvola(intensity_ima, w); + + unsigned w = win; + if (!w) + w = std::min(intensity_ima.nrows() / 3, intensity_ima.ncols() / 3); + if (! w % 2) + ++w; + w = std::min(w, conf.sauvola_min_w); + + if (multi_scale_bin) + { + std::cout << "** Using sauvola_ms with w_1 = " << w << std::endl; + input = scribo::binarization::sauvola_ms(intensity_ima, w, conf.sauvola_s); + } + else + { + std::cout << "** Using sauvola with w_1 = " << w << std::endl; + input = scribo::binarization::sauvola(intensity_ima, w); + } } if (debug) -- 1.5.6.5