Olena-patches March 2013

olena-patches@lrde.epita.fr

5 participants
214 discussions

olena-2.0-388-gd4b28f4 Work with mutlipages PDF

by Anthony Seure

--- scribo/sandbox/icdar_13_table/Makefile | 13 ++- scribo/sandbox/icdar_13_table/src/main.cc | 184 +++++++++++++++++------------ 2 files changed, 114 insertions(+), 83 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/Makefile b/scribo/sandbox/icdar_13_table/Makefile index 2420eec..4e552dd 100644 --- a/scribo/sandbox/icdar_13_table/Makefile +++ b/scribo/sandbox/icdar_13_table/Makefile @@ -1,8 +1,8 @@ CCACHE= CC=g++ -CFLAGS=-Wall -Werror -O3 -CLIBS=-I../../../milena/ -I../../ -CLEAN=*.o $(OUTPUT) output/* log final.xml +CFLAGS=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG +CLIBS=-I../../../milena/ -I../../ -I/usr/include/poppler +CLEAN=*.o output/* log final.xml SRC=src/main.cc OUTPUT=table @@ -10,9 +10,12 @@ OUTPUT=table all: table table: - $(CCACHE) $(CC) $(CFLAGS) -DHAVE_TESSERACT_3 $(CLIBS) $(SRC) -ltesseract -o $(OUTPUT) + $(CCACHE) $(CC) $(CFLAGS) $(CLIBS) $(SRC) -ltesseract -lpoppler-cpp -o $(OUTPUT) clean: rm -rf $(CLEAN) -.PHONY: table +mrproper: clean + rm -f $(OUTPUT) + +.PHONY: table clean mrproper diff --git a/scribo/sandbox/icdar_13_table/src/main.cc b/scribo/sandbox/icdar_13_table/src/main.cc index 7151b16..be394ba 100644 --- a/scribo/sandbox/icdar_13_table/src/main.cc +++ b/scribo/sandbox/icdar_13_table/src/main.cc @@ -8,6 +8,7 @@ #include <mln/fun/v2v/rgb_to_luma.hh> #include <mln/io/pbm/all.hh> +#include <mln/io/pdf/load.hh> #include <mln/io/ppm/all.hh> #include <mln/labeling/all.hh> @@ -180,6 +181,10 @@ void find_borders(image2d<bool>& ima, bottom = find_bottom(ima); } + /********/ + /* MAIN */ + /********/ + int main(int argc, char** argv) { typedef value::label_16 V; @@ -195,116 +200,139 @@ int main(int argc, char** argv) V nhlines, nvlines; L hlines_ima, vlines_ima; scribo::component_set<L> hlines, vlines; + std::ostringstream path; - // PARAMETERS + // Parameters unsigned av_height = 4; unsigned av_width = 4; int delta_prox_h = 5; unsigned min_height = 71; unsigned min_width = 31; + unsigned dpi = 72; - // Loadin and binarization + // Loading and binarization std::ofstream xml; start_xml(xml, "final.xml", argv[1]); - io::ppm::load(original, argv[1]); - filtered = data::transform(original, mln::fun::v2v::rgb_to_luma<value::int_u8>()); + //io::ppm::load(original, argv[1]); + util::array< image2d<value::rgb8> > pdf; + io::pdf::load(pdf, argv[1], dpi); + for (unsigned page = 0; page < pdf.nelements(); ++page) + { + original = pdf[page]; + filtered = data::transform(original, mln::fun::v2v::rgb_to_luma<value::int_u8>()); - bin = scribo::binarization::sauvola(filtered, 81, 0.44); - final = data::convert(value::rgb8(), bin); + bin = scribo::binarization::sauvola(filtered, 81, 0.44); + final = data::convert(value::rgb8(), bin); - initialize(mask, bin); - initialize(ima_texts, bin); - initialize(ima_tables, bin); - data::fill(ima_tables, false); + initialize(mask, bin); + initialize(ima_texts, bin); + initialize(ima_tables, bin); + data::fill(ima_tables, false); - bin_without_lines = duplicate(bin); + bin_without_lines = duplicate(bin); - // Lines extraction - hlines = scribo::primitive::extract::lines_h_discontinued(bin, c4(), nhlines, min_width, 2); - vlines = scribo::primitive::extract::lines_v_discontinued(bin, c4(), nvlines, min_height, 2); + // Lines extraction + hlines = scribo::primitive::extract::lines_h_discontinued(bin, c4(), nhlines, min_width, 2); + vlines = scribo::primitive::extract::lines_v_discontinued(bin, c4(), nvlines, min_height, 2); - get_horizontal_lines(hlines, ima_tables, bin_without_lines, av_height); - get_vertical_lines(vlines, ima_tables, bin_without_lines, av_width, delta_prox_h); + get_horizontal_lines(hlines, ima_tables, bin_without_lines, av_height); + get_vertical_lines(vlines, ima_tables, bin_without_lines, av_width, delta_prox_h); - // Denoising - bin_without_lines_denoised = scribo::preprocessing::denoise_fg(bin_without_lines, c8(), 3); + // Denoising + bin_without_lines_denoised = scribo::preprocessing::denoise_fg(bin_without_lines, c8(), 4); - // Set the tables mask - unsigned n; - labeled = labeling::blobs(ima_tables, c8(), n); - masks = scribo::component_set< image2d<unsigned> >(labeled, n); - data::fill(mask, false); + // Set the tables mask + unsigned n; + labeled = labeling::blobs(ima_tables, c8(), n); + masks = scribo::component_set< image2d<unsigned> >(labeled, n); + data::fill(mask, false); - for (unsigned i = 1; i <= masks.nelements(); ++i) - data::fill((mask | masks(i).bbox()).rw(), true); + for (unsigned i = 1; i <= masks.nelements(); ++i) + data::fill((mask | masks(i).bbox()).rw(), true); - // Compose table zones with bin_without_lines_lines - ima_texts = logical::and_(bin_without_lines_denoised, mask); + // Compose table zones with bin_without_lines_lines + ima_texts = logical::and_(bin_without_lines_denoised, mask); - // Isolate texts between tables - for (unsigned i = 1; i <= masks.nelements(); ++i) - { - image2d<bool> table_mask, isolated_text; - std::ostringstream path; - bool empty = true; + // Isolate texts between tables + for (unsigned i = 1; i <= masks.nelements(); ++i) + { + image2d<bool> table_mask, isolated_text; + bool empty = true; - initialize(table_mask, bin); - data::fill(table_mask, false); - data::fill((table_mask | masks(i).bbox()).rw(), true); + initialize(table_mask, bin); + data::fill(table_mask, false); + data::fill((table_mask | masks(i).bbox()).rw(), true); - isolated_text = logical::and_(bin_without_lines_denoised, table_mask); + isolated_text = logical::and_(bin_without_lines_denoised, table_mask); - mln_piter_(image2d<bool>) p(isolated_text.domain()); + mln_piter_(image2d<bool>) p(isolated_text.domain()); - for_all(p) - empty = empty && !(isolated_text(p)); + for_all(p) + empty = empty && !(isolated_text(p)); - if (!empty) - { - path << "output/8_" << i << "_isolated.pbm"; - io::pbm::save(isolated_text, path.str()); + if (!empty) + { + path.str(""); + path << "output/p" << page << "_8_" << i << "_isolated.pbm"; + io::pbm::save(isolated_text, path.str()); - // Find coordinated - unsigned left, right, top, bottom; - find_borders(isolated_text, left, right, top, bottom); + // Find coordinates + unsigned left, right, top, bottom; + find_borders(isolated_text, left, right, top, bottom); - std::cout << "(" << left << "," << top << ") ->" - << "(" << right << "," << bottom << ")" << std::endl; + point2d p1, p2, p3, p4; - point2d p1, p2, p3, p4; + p1 = point2d(top, left); + p2 = point2d(top, right); + p3 = point2d(bottom, right); + p4 = point2d(bottom, left); - p1 = point2d(top, left); - p2 = point2d(top, right); - p3 = point2d(bottom, right); - p4 = point2d(bottom, left); + draw::line(final, p1, p2, literal::green); + draw::line(final, p2, p3, literal::green); + draw::line(final, p3, p4, literal::green); + draw::line(final, p4, p1, literal::green); - draw::line(final, p1, p2, literal::red); - draw::line(final, p2, p3, literal::red); - draw::line(final, p3, p4, literal::red); - draw::line(final, p4, p1, literal::red); - - write_table(xml, p1, p3); + write_table(xml, p1, p3); + } } - } - // Get lines images - hlines_ima = hlines.labeled_image(); - vlines_ima = vlines.labeled_image(); - ima_hlines = data::convert(bool(), hlines_ima); - ima_vlines = data::convert(bool(), vlines_ima); - - // Write images and close XML - io::pbm::save(bin, "output/0_bin.pbm"); - io::pbm::save(bin_without_lines, "output/1_bin_without_lines.pbm"); - io::pbm::save(bin_without_lines_denoised, "output/2_bin_without_lines_denoised.pbm"); - io::pbm::save(ima_hlines, "output/3_hlines.pbm"); - io::pbm::save(ima_vlines, "output/4_vlines.pbm"); - io::pbm::save(ima_tables, "output/5_tables.pbm"); - io::pbm::save(mask, "output/6_mask.pbm"); - io::pbm::save(ima_texts, "output/7_texts.pbm"); - /* Save 8_i_isolated */ - io::ppm::save(final, "output/9_final.ppm"); + // Get lines images + hlines_ima = hlines.labeled_image(); + vlines_ima = vlines.labeled_image(); + ima_hlines = data::convert(bool(), hlines_ima); + ima_vlines = data::convert(bool(), vlines_ima); + + // Write images and close XML + path.str(""); path << "output/p" << page << "_0_bin.pbm"; + io::pbm::save(bin, path.str()); + + path.str(""); path << "output/p" << page << "_1_bin_without_lines.pbm"; + io::pbm::save(bin_without_lines, path.str()); + + path.str(""); path << "output/p" << page << "_2_bin_without_lines_denoised.pbm"; + io::pbm::save(bin_without_lines_denoised, path.str()); + + path.str(""); path << "output/p" << page << "_3_hlines.pbm"; + io::pbm::save(ima_hlines, path.str()); + + path.str(""); path << "output/p" << page << "_4_vlines.pbm"; + io::pbm::save(ima_vlines, path.str()); + + path.str(""); path << "output/p" << page << "_5_tables.pbm"; + io::pbm::save(ima_tables, path.str()); + + path.str(""); path << "output/p" << page << "_6_mask.pbm"; + io::pbm::save(mask, path.str()); + + path.str(""); path << "output/p" << page << "_7_texts.pbm"; + io::pbm::save(ima_texts, path.str()); + + /* Save 8_i_isolated */ + + path.str(""); path << "output/p" << page << "_9_final.pbm"; + io::ppm::save(final, path.str()); + } end_xml(xml); -- 1.7.2.5

11 years, 9 months

branch sandbox/anthony updated: olena-2.0-387-g99b3631

by git＠lrde.epita.fr

11 years, 9 months

olena-2.0-387-g99b3631 Output a simple and valid XML and image of bounding boxes + Add TODO file

by Anthony Seure

--- scribo/sandbox/icdar_13_table/TODO | 12 ++++++++++++ scribo/sandbox/icdar_13_table/src/main.cc | 25 ++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/TODO diff --git a/scribo/sandbox/icdar_13_table/TODO b/scribo/sandbox/icdar_13_table/TODO new file mode 100644 index 0000000..b34e7a2 --- /dev/null +++ b/scribo/sandbox/icdar_13_table/TODO @@ -0,0 +1,12 @@ +#------------------------------------------------------------------------------# + TODO LIST - ICDAR 2013 - Table competition +#------------------------------------------------------------------------------# + +Table location sub-competition : + * Load PDF files (instead of PNM) + * Find links betwwen pages for mutlipages tables + * Get text from reversed-video zones + * Expand the process to borderless tables + +Table structure recognition sub-competition : + * All diff --git a/scribo/sandbox/icdar_13_table/src/main.cc b/scribo/sandbox/icdar_13_table/src/main.cc index e4dbb11..7151b16 100644 --- a/scribo/sandbox/icdar_13_table/src/main.cc +++ b/scribo/sandbox/icdar_13_table/src/main.cc @@ -1,7 +1,9 @@ #include <mln/binarization/all.hh> #include <mln/core/image/image2d.hh> + #include <mln/data/all.hh> +#include <mln/draw/line.hh> #include <mln/fun/v2v/rgb_to_luma.hh> @@ -9,6 +11,7 @@ #include <mln/io/ppm/all.hh> #include <mln/labeling/all.hh> +#include <mln/literal/all.hh> #include <mln/logical/and.hh> #include <mln/value/all.hh> @@ -45,7 +48,8 @@ void write_table(std::ofstream& xml, const point2d& start, const point2d& end) << "\t\t<region id='" << region << "' page='" << page << "'>" << std::endl << "\t\t<bounding-box x1='" << start[1] << "' y1='" << start[0] << "' " << "x2='" << end[1] << "' y2='" << end[0] << "'/>" << std::endl - << "\t\t</region>" << std::endl; + << "\t\t</region>" << std::endl + << "\t</table>" << std::endl; ++table; } @@ -181,7 +185,7 @@ int main(int argc, char** argv) typedef value::label_16 V; typedef image2d<V> L; - image2d<value::rgb8> original; + image2d<value::rgb8> original, final; image2d<value::int_u8> filtered; image2d<bool> bin, ima_hlines, ima_vlines, ima_tables, ima_texts, bin_without_lines, bin_without_lines_denoised, @@ -207,6 +211,7 @@ int main(int argc, char** argv) filtered = data::transform(original, mln::fun::v2v::rgb_to_luma<value::int_u8>()); bin = scribo::binarization::sauvola(filtered, 81, 0.44); + final = data::convert(value::rgb8(), bin); initialize(mask, bin); initialize(ima_texts, bin); @@ -266,9 +271,22 @@ int main(int argc, char** argv) std::cout << "(" << left << "," << top << ") ->" << "(" << right << "," << bottom << ")" << std::endl; + + point2d p1, p2, p3, p4; + + p1 = point2d(top, left); + p2 = point2d(top, right); + p3 = point2d(bottom, right); + p4 = point2d(bottom, left); + + draw::line(final, p1, p2, literal::red); + draw::line(final, p2, p3, literal::red); + draw::line(final, p3, p4, literal::red); + draw::line(final, p4, p1, literal::red); + + write_table(xml, p1, p3); } } - // Get lines images hlines_ima = hlines.labeled_image(); @@ -286,6 +304,7 @@ int main(int argc, char** argv) io::pbm::save(mask, "output/6_mask.pbm"); io::pbm::save(ima_texts, "output/7_texts.pbm"); /* Save 8_i_isolated */ + io::ppm::save(final, "output/9_final.ppm"); end_xml(xml); -- 1.7.2.5

11 years, 9 months

branch sandbox/anthony updated: olena-2.0-386-g023ba49

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 023ba4982dddb83f3bde1d78d849f025a8f70d8c (commit) from 28f05e67c5ca54c7fbaf2b37a9630ecc746fa78f (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 ----------------------------------------------------------------- 023ba49 Find bounding coordinates for each tables ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/icdar_13_table/src/main.cc | 122 +++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-386-g023ba49 Find bounding coordinates for each tables

by Anthony Seure

--- scribo/sandbox/icdar_13_table/src/main.cc | 122 +++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/main.cc b/scribo/sandbox/icdar_13_table/src/main.cc index 2ed125d..e4dbb11 100644 --- a/scribo/sandbox/icdar_13_table/src/main.cc +++ b/scribo/sandbox/icdar_13_table/src/main.cc @@ -88,6 +88,94 @@ void get_vertical_lines(scribo::component_set<L>& vlines, } } +unsigned find_left(image2d<bool>& ima) +{ + bool found = false; + + def::coord col = geom::min_col(ima); + while (col < geom::max_col(ima) && !found) + { + def::coord row = geom::min_row(ima); + while (row < geom::max_row(ima) && !found) + { + found = opt::at(ima, row, col); + ++row; + } + ++col; + } + + return (col - 1); +} + +unsigned find_right(image2d<bool>& ima) +{ + bool found = false; + + def::coord col = geom::max_col(ima) - 1; + while (col >= geom::min_col(ima) && !found) + { + def::coord row = geom::min_row(ima); + while (row < geom::max_row(ima) && !found) + { + found = opt::at(ima, row, col); + ++row; + } + --col; + } + + return (col + 1); + +} + +unsigned find_top(image2d<bool>& ima) +{ + bool found = false; + + def::coord row = geom::min_row(ima); + while (row < geom::max_row(ima) && !found) + { + def::coord col = geom::min_col(ima); + while (col < geom::max_col(ima) && !found) + { + found = opt::at(ima, row, col); + ++col; + } + ++row; + } + + return (row - 1); + +} + +unsigned find_bottom(image2d<bool>& ima) +{ + bool found = false; + + def::coord row = geom::max_row(ima) - 1; + while (row >= geom::min_row(ima) && !found) + { + def::coord col = geom::min_col(ima); + while (col < geom::max_col(ima) && !found) + { + found = opt::at(ima, row, col); + ++col; + } + --row; + } + + return (row + 1); +} + +void find_borders(image2d<bool>& ima, + unsigned& left, unsigned& right, + unsigned& top, unsigned& bottom) +{ + left = find_left(ima); + right = find_right(ima); + top = find_top(ima); + bottom = find_bottom(ima); +} + int main(int argc, char** argv) { typedef value::label_16 V; @@ -149,6 +237,39 @@ int main(int argc, char** argv) // Compose table zones with bin_without_lines_lines ima_texts = logical::and_(bin_without_lines_denoised, mask); + // Isolate texts between tables + for (unsigned i = 1; i <= masks.nelements(); ++i) + { + image2d<bool> table_mask, isolated_text; + std::ostringstream path; + bool empty = true; + + initialize(table_mask, bin); + data::fill(table_mask, false); + data::fill((table_mask | masks(i).bbox()).rw(), true); + + isolated_text = logical::and_(bin_without_lines_denoised, table_mask); + + mln_piter_(image2d<bool>) p(isolated_text.domain()); + + for_all(p) + empty = empty && !(isolated_text(p)); + + if (!empty) + { + path << "output/8_" << i << "_isolated.pbm"; + io::pbm::save(isolated_text, path.str()); + + // Find coordinated + unsigned left, right, top, bottom; + find_borders(isolated_text, left, right, top, bottom); + + std::cout << "(" << left << "," << top << ") ->" + << "(" << right << "," << bottom << ")" << std::endl; + } + } + + // Get lines images hlines_ima = hlines.labeled_image(); vlines_ima = vlines.labeled_image(); @@ -164,6 +285,7 @@ int main(int argc, char** argv) io::pbm::save(ima_tables, "output/5_tables.pbm"); io::pbm::save(mask, "output/6_mask.pbm"); io::pbm::save(ima_texts, "output/7_texts.pbm"); + /* Save 8_i_isolated */ end_xml(xml); -- 1.7.2.5

11 years, 9 months

branch sandbox/anthony created: olena-2.0-385-g28f05e6

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 created at 28f05e67c5ca54c7fbaf2b37a9630ecc746fa78f (commit) - Log ----------------------------------------------------------------- 28f05e6 [ICDAR_13] Find texts inside cells on cropped tables ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-385-g28f05e6 [ICDAR_13] Find texts inside cells on cropped tables

by Anthony Seure

--- scribo/sandbox/icdar_13_table/Makefile | 18 +++ scribo/sandbox/icdar_13_table/src/main.cc | 171 +++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 0 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/Makefile create mode 100644 scribo/sandbox/icdar_13_table/src/main.cc diff --git a/scribo/sandbox/icdar_13_table/Makefile b/scribo/sandbox/icdar_13_table/Makefile new file mode 100644 index 0000000..2420eec --- /dev/null +++ b/scribo/sandbox/icdar_13_table/Makefile @@ -0,0 +1,18 @@ +CCACHE= +CC=g++ +CFLAGS=-Wall -Werror -O3 +CLIBS=-I../../../milena/ -I../../ +CLEAN=*.o $(OUTPUT) output/* log final.xml + +SRC=src/main.cc +OUTPUT=table + +all: table + +table: + $(CCACHE) $(CC) $(CFLAGS) -DHAVE_TESSERACT_3 $(CLIBS) $(SRC) -ltesseract -o $(OUTPUT) + +clean: + rm -rf $(CLEAN) + +.PHONY: table diff --git a/scribo/sandbox/icdar_13_table/src/main.cc b/scribo/sandbox/icdar_13_table/src/main.cc new file mode 100644 index 0000000..2ed125d --- /dev/null +++ b/scribo/sandbox/icdar_13_table/src/main.cc @@ -0,0 +1,171 @@ +#include <mln/binarization/all.hh> + +#include <mln/core/image/image2d.hh> +#include <mln/data/all.hh> + +#include <mln/fun/v2v/rgb_to_luma.hh> + +#include <mln/io/pbm/all.hh> +#include <mln/io/ppm/all.hh> + +#include <mln/labeling/all.hh> +#include <mln/logical/and.hh> + +#include <mln/value/all.hh> + +#include <tesseract/baseapi.h> + +#include <scribo/binarization/sauvola.hh> +#include <scribo/core/component_set.hh> +#include <scribo/preprocessing/denoise_fg.hh> +#include <scribo/primitive/extract/all.hh> + +using namespace mln; + +void start_xml(std::ofstream& xml, const char* name, const char* pdf) +{ + xml.open(name); + xml << "<?xml version\"1.0\" encoding=\"UTF-8\"?>" << std::endl + << "<document filename='" << pdf << "'>" << std::endl; +} + +void end_xml(std::ofstream& xml) +{ + xml << "</document>" << std::endl; + xml.close(); +} + +void write_table(std::ofstream& xml, const point2d& start, const point2d& end) +{ + static unsigned table = 0; + static unsigned region = 0; + static unsigned page = 1; + + xml << "\t<table id='" << table << "'>" << std::endl + << "\t\t<region id='" << region << "' page='" << page << "'>" << std::endl + << "\t\t<bounding-box x1='" << start[1] << "' y1='" << start[0] << "' " + << "x2='" << end[1] << "' y2='" << end[0] << "'/>" << std::endl + << "\t\t</region>" << std::endl; + + ++table; +} + +template<typename L> +void get_horizontal_lines(scribo::component_set<L>& hlines, + image2d<bool>& ima, + image2d<bool>& bin_without, + const unsigned av_height) +{ + for (unsigned i = 1; i <= hlines.nelements(); ++i) + { + const box2d& b = hlines(i).bbox(); + + data::fill((bin_without | b).rw(), false); + + if (b.height() != 0 && b.width() != 0 && b.height() < av_height) + data::fill((ima | b).rw(), true); + } +} + +template<typename L> +void get_vertical_lines(scribo::component_set<L>& vlines, + image2d<bool>& ima, + image2d<bool>& bin_without, + const unsigned av_width, + const int delta_prox_h) +{ + for (unsigned i = 1; i <= vlines.nelements(); ++i) + { + const box2d& b = vlines(i).bbox(); + + data::fill((bin_without | b).rw(), false); + + if (b.height() != 0 && b.width() != 0 + && b.width() < av_width) + if (vlines(i).mass_center()[1] - vlines(i - 1).mass_center()[1] > delta_prox_h + || vlines(i).mass_center()[1] < vlines(i - 1).mass_center()[1]) + data::fill((ima | b).rw(), true); + } +} + +int main(int argc, char** argv) +{ + typedef value::label_16 V; + typedef image2d<V> L; + + image2d<value::rgb8> original; + image2d<value::int_u8> filtered; + image2d<bool> bin, ima_hlines, ima_vlines, ima_tables, ima_texts, + bin_without_lines, bin_without_lines_denoised, + mask; + image2d<unsigned> labeled; + scribo::component_set< image2d<unsigned> > masks; + V nhlines, nvlines; + L hlines_ima, vlines_ima; + scribo::component_set<L> hlines, vlines; + + // PARAMETERS + unsigned av_height = 4; + unsigned av_width = 4; + int delta_prox_h = 5; + unsigned min_height = 71; + unsigned min_width = 31; + + // Loadin and binarization + std::ofstream xml; + start_xml(xml, "final.xml", argv[1]); + + io::ppm::load(original, argv[1]); + filtered = data::transform(original, mln::fun::v2v::rgb_to_luma<value::int_u8>()); + + bin = scribo::binarization::sauvola(filtered, 81, 0.44); + + initialize(mask, bin); + initialize(ima_texts, bin); + initialize(ima_tables, bin); + data::fill(ima_tables, false); + + bin_without_lines = duplicate(bin); + + // Lines extraction + hlines = scribo::primitive::extract::lines_h_discontinued(bin, c4(), nhlines, min_width, 2); + vlines = scribo::primitive::extract::lines_v_discontinued(bin, c4(), nvlines, min_height, 2); + + get_horizontal_lines(hlines, ima_tables, bin_without_lines, av_height); + get_vertical_lines(vlines, ima_tables, bin_without_lines, av_width, delta_prox_h); + + // Denoising + bin_without_lines_denoised = scribo::preprocessing::denoise_fg(bin_without_lines, c8(), 3); + + // Set the tables mask + unsigned n; + labeled = labeling::blobs(ima_tables, c8(), n); + masks = scribo::component_set< image2d<unsigned> >(labeled, n); + data::fill(mask, false); + + for (unsigned i = 1; i <= masks.nelements(); ++i) + data::fill((mask | masks(i).bbox()).rw(), true); + + // Compose table zones with bin_without_lines_lines + ima_texts = logical::and_(bin_without_lines_denoised, mask); + + // Get lines images + hlines_ima = hlines.labeled_image(); + vlines_ima = vlines.labeled_image(); + ima_hlines = data::convert(bool(), hlines_ima); + ima_vlines = data::convert(bool(), vlines_ima); + + // Write images and close XML + io::pbm::save(bin, "output/0_bin.pbm"); + io::pbm::save(bin_without_lines, "output/1_bin_without_lines.pbm"); + io::pbm::save(bin_without_lines_denoised, "output/2_bin_without_lines_denoised.pbm"); + io::pbm::save(ima_hlines, "output/3_hlines.pbm"); + io::pbm::save(ima_vlines, "output/4_vlines.pbm"); + io::pbm::save(ima_tables, "output/5_tables.pbm"); + io::pbm::save(mask, "output/6_mask.pbm"); + io::pbm::save(ima_texts, "output/7_texts.pbm"); + + end_xml(xml); + + return 0; +} -- 1.7.2.5

11 years, 9 months

branch exp/viewer-new updated: olena-2.0-386-gc3550ec

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 exp/viewer-new has been updated discards 219cea371cdcc04bfb029023ce0fb85f2673edfe (commit) discards 8dfa78afec71e0b960b3a2b2178f70bd87094643 (commit) via c3550ec3eef049edfb394f5b7d8415e1eec74b27 (commit) via d17f8e48fecf710e46b93a0d8d5cb4ec3b595d98 (commit) via 0f58d1befe8352b14321a35a576372eb3f285e48 (commit) via 8587fe0a3705ed9c0d0c13fe4920e1fd2be79166 (commit) via 9798a84419229c0ed80455b987e3d8c0bacf73e0 (commit) via 0742e5853b40d000c7f68244ac2ba7c2727aa653 (commit) via 39cd8bb0844fdc13dd1a446b8a2d8e065fd8fda0 (commit) via a58bc6166e9db154783dda48834562c6e3104dd5 (commit) via 72aefb5e99e8b67d190b085870bf2a312da2ffd1 (commit) via fe47061225d38e85bba2d1c2ece9b59cec846554 (commit) via 98e0ae2659d4741037f830d9802cbabd611b2c60 (commit) via db5e6de389c6b8e9518ef4de7942814aad87632e (commit) via 50162561168502a3eaa347a6174d01b5a6ff84bf (commit) via ac9992b6855465cc0423d15614eb139832ba6b19 (commit) via de04100cea00f07eed0e57b9c75981807f88c526 (commit) via 37a7c077ad030ae82a2578f111c8c81f154cd79a (commit) via 4d3fb09e2ada73a4ae524aa1d92b4df94b5feb8f (commit) via 04d285daca6e4a49aca19452867d69e590f65872 (commit) via 3db8efb4fcabe7bcd660a0305dd8cdcf95b24ad2 (commit) via 05b5b7f74e9d46b86c75c9b59b1d6f4cf2346197 (commit) via 3e79613c66933470477ad294b0160a268efffad5 (commit) via 9f46e3619b725e8698a44a85bfacd7fd391dae67 (commit) via a65249126b3a5d0fddf99a8c08c85501384489a5 (commit) via 915d0229e42cdbbebc2b0d7e8b3b9a4207bd4af3 (commit) via 0040bce0d299dbb3a0cd0efc404b1db091ff5b02 (commit) via b4e3abb030675b2202fb3653437e25d3896331d3 (commit) via f41aa12092fea22cf9b945972e9419d0d512b714 (commit) via cbb5fa735979aecf5ebdcbfe43c4ea28e2d293c0 (commit) via f24d7ded78c130a0f62b2d6f913b0019fb1c6353 (commit) via 684da60a6ce3e887480f516732406d9ec1377228 (commit) via 1b88ca280292337cb8a4132aaf40c7dc2eb28f66 (commit) via 53f3077a9c1d2e26e0ac2426ae70a8c9fbfd9456 (commit) via 3b6e65a8b6942e67881d305d437fc223ac78ec59 (commit) via b85c04d12a8e42626b39c81e089f28fec7617c9c (commit) via 1016a8d75207758f16b97ab03ed36d5b98d446b4 (commit) via e9046e9bb65f29b1cf08ff9d1e387fe45a248523 (commit) via 82927af9e88c79eeae35fd1f90bb3fb58e28f700 (commit) via 73e1175c31dec55a00344ad69d0fab89b2f33ac0 (commit) via 1269087d5405ffbb3d0d8e2c4303b4a7791ab554 (commit) via 1938ecf899d1fed5384fbacc570530a457025c16 (commit) via 1a5a07247f7d45146dcb155f881e581a50989cc7 (commit) via 64c3f043be87167c60d809558d62353a4c00835a (commit) via d0ad964800b4f917cba9858647bf8ce02fac8d68 (commit) via 5e471a1fda28428c100013a8498ae6df0a09fdf3 (commit) via 057e6f995a4b452ab8549d1757cccdb27aa6fc7b (commit) via 1a4ab8e0382019975e28516029798728a2825c7a (commit) via 496247d4a7a107847bce30b9f92028076928df8c (commit) via 6f00b5ab597acf93b710bdddff365e6a99dd3ee7 (commit) via 67a55f1a02f4e2153cd0e5e59ab4849fd32a92fa (commit) via 729caf4db998dbb20f2a6dbfce1d1faf19cac2f8 (commit) via cbb4d0fb25cdee9d97935814940c2eb1c014f83b (commit) via 9f7c79c04c2dbc28d3fe4f9cae0b780bd6bdafbd (commit) via 2d3801c3e7dea29729a11a0beb64d07b61ead7e9 (commit) via f0bd11eafd5bfec99c42fc2a1c5d668bee802aec (commit) via a3a8d02aed476851688b8564ab877ba2d72763a5 (commit) via cacbfbd3aa2d99d1d84e8d0cc6014c41911ac5a2 (commit) via 2cd03c3e1e462d24efd69f763388c2c897cc0687 (commit) via 6b6ff3653753d0fe90e1f4b093e3d0c6eb95b72b (commit) via 1633d27748aea942d0e0cf379939e5e3c759b0b5 (commit) via f485fc260acfc2c081c26b8bf303367f6567cb3d (commit) via c6e3ab6152a74c7dd34bc9cd41e16de0c114dece (commit) via 46db5affbfda769b80d8cef3a6222be4b375649e (commit) via 0b1efa21dd750a9559f5e313c6718d783efc9044 (commit) via 23f3b30f300046e11aaf660916a6040c23cf6687 (commit) via a73499bf5cbbe38c4c36a9fb551df52a43a0b9f9 (commit) via d346c91aa628ef39691078cff3f52b4c1019faec (commit) via e5c4946ac2cc04f9d06ec2b959cef592d76b68dd (commit) via 4ceffd14a660391922d2e9409d18bea93bc4824d (commit) via ea3b8de392f302d30afc3affb6306a97234d5a9d (commit) via 9630fe29b41febb6b57ecafdba8eac4151983ed8 (commit) via 3c0fa701a3b712e2a0a3f0461d1f949f7486ad3f (commit) via 1f8a77c5b18d43c65b56876a53753eed4f0a0435 (commit) via 559bf0a04c9895a90c13e20da23dbbc1db658430 (commit) via 60618b0d48a4973b4342381e0393cc30a92fa12c (commit) via 609f8023bf0fc3709b9561218c3d2c9e38b14f4d (commit) via 3272d15115ee8140be4e56f71a38a255924c2f9c (commit) via a3c4e92af2f032177fcb4c55b9133fc653bf8797 (commit) via 18a13882c4913046aa1d2b32fe59169289d1e879 (commit) via 45129d3fb632ea16e5b70ca45f077c8f50b8f43f (commit) via 46fe91173668ad5c331c5687de8268c7160a18a7 (commit) via 6e2cefa449cd91c115de3951a2db5046f2246ef5 (commit) via 4e4b11504e814bfeff1be05e3045599d2d758ae2 (commit) via 01f60706dcad67fb488f43ee752f5a6a91790d82 (commit) via f884a769ff40c57eec2c7423e01ffb9ea9d22312 (commit) via 5963d6b5e6fa29923976624777964b2c66c13087 (commit) via f0c488c54c924186a00003c899bf67d73ef577f9 (commit) via e97be13ff50026610cc3b970d80221f819dacfc2 (commit) via 7e065e0e5f6be35574c5ea8c1260be79f5be1c49 (commit) via 9d6aa0aed479c79c07ce250cc0f37b8787b416b8 (commit) via da8955a22c1dcb7945d813a802bceee05c129594 (commit) via c37c7275749e5e85303ad4d19db9de5a533cbb01 (commit) via b703a0846caa205810f7bb044f6af5a1dc881472 (commit) via b460ca006fc7f6d667402ef56cd474e422ab61d2 (commit) via b05f4e5c24d32b2d704badd28fd16dfa4a235bc6 (commit) via d437055460812dd65223c65cab4e7e5969a8abab (commit) via 54991acadad4a1bf95775f008523abae92be629b (commit) via b0bb6e941bc9f919230b4325eb2b1c7a3013965f (commit) via 05ee3ad749a9b93eaf83c1c6592e52f833d99c6d (commit) via 27529df7bcf7d4c3c612ad30fe9f515a916e2335 (commit) via 2d34749645fb87a0c39eb0e4bc360229966c23fd (commit) via f7985a1b13b6492cf8bbbb80ac88fdb3da625005 (commit) via ea5d166701036d0d1e122207eba99e12a0d4bd19 (commit) via 9a4c370d70d77e55335f0edd439ba05ed1b48cc2 (commit) via 2259dac7ff20288fa4ced237fe130e2b43d6a899 (commit) via 82e9a800c21f1ad6d0f7f1bda0ab35e8085efff8 (commit) via c0d74f75777ed91e438585213e822fd157bb6ae6 (commit) via 73e6122bc42441269f4f5e7b910776a6f48d9858 (commit) via 9e462d200d5a34807c0ab51d78ef673f5f971eaf (commit) via 7c295e9a97f61828690aef3c49fe57d040755742 (commit) via ae6ece0b9ef941ce0b3b78464cc0cdbc3358b076 (commit) via 83730f3636b957e86790ebb77d262a318d069a31 (commit) via cb5fd5a3f568139c16527b78ac408b1dc64c9aa6 (commit) via e3a68da1d9c1f203583fd852d2e832708d589aee (commit) via 3e10eb3e8a3ce921c60e339ce4f95986d830b204 (commit) via d9daf6a22df7eee41142c35f76b6005d36f0255c (commit) via d9deb1a5fbfd94f4e258dda46eb76850d98a2100 (commit) via 2622f3b9a752ffe303b112407dbae3ff244e8732 (commit) via fa8caca7bc39e60e166cf781cc480a9a03066ac9 (commit) via 0489364acb29fce1e81015e5ed672ca4b2cdeb00 (commit) via db78cd2a5d91c3aff37a45b2fa1e0e21357ef39e (commit) via f6ef68f2adf0eb706d2a4bccc4309dd970db60a7 (commit) via 75b5aa1fab8a23c847933f3abe0904114fb9e3f2 (commit) via 21b5c2a1f58cb21e0c81946281ec0f99eb255f6d (commit) via 31d672634a5a4aaa407e263f8582f471bf4dd6b8 (commit) via 56f4535e0f6f5d1d49c8a8ce81618cd69861bc25 (commit) via 63becd70bbb829dfb24d94372db3666e814cbad2 (commit) via cd9f3d892aa40784a4872275cf8c8fb438af5ce9 (commit) via 5cb4a2bfcb0e98ef4a246ae0ded6dd5f744d5dd2 (commit) via 1e63053d217ca0b0735ddf911ffcae2ef74f7b9c (commit) via 0438f42fc20f8df995804213384c7518fb853621 (commit) via af5fd92fc335fd3f4b425cec2b7cb00c2e9ef096 (commit) via d4afa3d8482eda53eb7156782ce5aa3df92c85c8 (commit) via 7e6b2a1cd344ffd352650342cd6f75c7d6152e0b (commit) via 44961f41533b91a0f386bb922a66397b2678ac1a (commit) via e5f272e6d50607cbd8b4a8ee5d14ba58ea8f27ee (commit) via c2ba610e3c657efe7bd420dac8b2617c9f71fbfe (commit) via d9cc1c4fe9fbb614315ec2f51acfb95432ce36c6 (commit) via 6e6efc3747fa64514d57eb977a4fd4184529b9f8 (commit) via 67384e846bca908a792e9a75d330023f6e35058a (commit) via fb0ed414037658acb13a7eee3289958a90ffa8dc (commit) via 50b0efa869decc61d7874295d550447c8c67a836 (commit) via 83ee60cbbc629fe5971f838e776820b699829369 (commit) via 4218334ffe3b4a5808a33176d3fc5555c212218a (commit) via 31b45b44ce742f1ab77836584175a90ff33b814b (commit) via b76254be410e30da7b020f6d1bbfb506b353ffe2 (commit) via a0a8f63a50c335157743aa6649df1ccc269e07af (commit) via 0e2a2c0e3f0b55633d367dbd40bca49f43996a83 (commit) via a839009d4bc937a5b5f4b395b520896301718cdf (commit) via d1a7a06e3a3129c7779b0a53cb549ae3076ad401 (commit) via ec1cc0bc37df0f9f7bc6a8b7cd020602086a2454 (commit) via b1d52c99df249e432799e01fce2f4d9d71e6e491 (commit) via a8f83ef394834b11b0c8f86805af9cb3fc0ca0cf (commit) via 664d9d7eee4551a7cf7f253b65bd5209fc852a43 (commit) via e375d14ff6fab8454dd6f282c85139a00814c189 (commit) via a987daa8807fa02b1c48ee3dcdc8c6c17f090fc5 (commit) via b09fb77709470fce35abdb91ce28a4254c6b6655 (commit) via 9be09ead743dbfc634178432fa97edec8e67506b (commit) via 241d1ffe1f6eaf75adac09403937f0f50ea4207e (commit) via a07c8c69b05b86bbc6d2c6655820f765d116b757 (commit) via d984d2d1b0b28f2a29202ea1d8d897484d13ebc1 (commit) via b90f28dc85494500273b1fc9c720a1971a04e86c (commit) via 9a65533963889db7c2411c5cf04d05efacd76445 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (219cea371cdcc04bfb029023ce0fb85f2673edfe) \ N -- N -- N (c3550ec3eef049edfb394f5b7d8415e1eec74b27) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- c3550ec Several small fixes in viewer. d17f8e4 AUTHORS: Add Antoine Froger. 0f58d1b Move new viewer to scribo/demo. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 198 +- ChangeLog | 259 ++ Makefile.am | 11 +- build-aux/texi2dvi | 8 +- configure.ac | 14 +- doc/.gitignore | 9 + doc/Doxyfile.in | 363 ++ doc/DoxygenLayout.xml | 183 + doc/Makefile.am | 219 ++ doc/about.dox | 13 + doc/bibliography.dox | 39 + doc/contributors.dox | 5 + doc/doc.bib | 38 + doc/doc.css | 27 + doc/doxygen.css | 1180 ++++++ doc/footer.html | 6 + doc/get_sources.dox | 37 + doc/header.html | 55 + doc/images/logo.jpg | Bin 0 -> 7477 bytes doc/images/olena_layers.png | Bin 0 -> 25711 bytes doc/images/olena_layers.svg | 368 ++ doc/licensing.dox | 18 + doc/lrde.bib | 3856 ++++++++++++++++++++ doc/mainpage.dox | 63 + doc/modules_list.dox | 9 + doc/olena.bib | 415 +++ doc/online_resources.dox | 34 + doc/subdoc_footer.html | 18 + doc/supported_platforms.dox | 45 + milena/ChangeLog | 826 +++++ milena/apps/graph-morpho/morpho.hh | 18 +- milena/demos/graph/region_adjacency_graph.cc | 41 +- milena/doc/.gitignore | 4 +- milena/doc/Doxyfile.in | 1806 +++++++++- milena/doc/DoxygenLayout.xml | 192 + milena/doc/Makefile.am | 76 +- milena/doc/doxyfuns.sty | 108 +- milena/doc/examples/box2d-bbox.cc | 2 +- milena/doc/examples/split/box2d-bbox-1.cc.raw | 2 +- .../split/tuto4_genericity_and_algorithms-4.cc.raw | 4 +- .../split/tuto4_genericity_and_algorithms-5.cc.raw | 4 +- .../examples/tuto4_genericity_and_algorithms.cc | 8 +- milena/doc/groups/accu.hh | 29 - milena/doc/groups/images.hh | 43 - milena/doc/groups/main.hh | 30 - milena/doc/groups/neighb.hh | 28 - milena/doc/img/genericity.png | Bin 0 -> 135325 bytes milena/doc/img/src/2dgrid.tikz | 16 + milena/doc/img/src/genericity.svg | 354 ++ milena/doc/img/src/standalone.cfg | 34 + milena/doc/img/src/standalone.cls | 837 +++++ milena/doc/img/src/ydoc.cfg | 40 + milena/doc/img/src/ydoc.cls | 21 + milena/doc/mainpage.dox | 128 + milena/doc/milena.qhcp | 11 + milena/doc/mln/accu/accu.dox | 45 + milena/doc/mln/canvas/canvas.dox | 27 + milena/doc/mln/core/image/concrete.dox | 6 + milena/doc/mln/core/image/domain_morpher.dox | 6 + milena/doc/mln/core/image/identity_morpher.dox | 6 + milena/doc/mln/core/image/images.dox | 8 + milena/doc/mln/core/image/morphers.dox | 6 + milena/doc/mln/core/image/value_morpher.dox | 6 + milena/doc/mln/core/neighb.dox | 36 + .../site_set.hh => mln/core/site_set/site_set.dox} | 0 milena/doc/mln/data/data.dox | 6 + milena/doc/mln/io/io.dox | 110 + milena/doc/mln/main.dox | 97 + milena/doc/mln/morpho/morpho.dox | 27 + milena/doc/{groups/graph.hh => mln/util/graph.dox} | 0 milena/doc/{groups/util.hh => mln/util/util.dox} | 0 milena/doc/{groups/win.hh => mln/win/win.dox} | 0 milena/doc/ref-guide.tex | 21 +- milena/doc/tutorial.tex | 159 +- milena/doc/white-paper.tex | 2 +- milena/headers.mk | 1 + milena/mln/accu/compute.hh | 53 +- milena/mln/accu/internal/couple.hh | 16 +- milena/mln/algebra/h_mat.hh | 96 +- milena/mln/algebra/h_vec.hh | 6 +- milena/mln/algebra/mat.hh | 269 +- milena/mln/algebra/quat.hh | 74 +- milena/mln/algebra/vec.hh | 4 +- milena/mln/binarization/threshold.hh | 22 +- milena/mln/border/adjust.hh | 9 +- milena/mln/border/duplicate.hh | 4 +- milena/mln/border/equalize.hh | 10 +- milena/mln/border/fill.hh | 6 +- milena/mln/border/find.hh | 6 +- milena/mln/border/get.hh | 5 +- milena/mln/border/mirror.hh | 14 +- milena/mln/border/resize.hh | 9 +- milena/mln/border/resize_equal.hh | 9 +- milena/mln/border/thickness.hh | 8 +- milena/mln/canvas/browsing/backdiagonal2d.hh | 42 +- milena/mln/canvas/browsing/breadth_first_search.hh | 10 +- milena/mln/canvas/browsing/depth_first_search.hh | 10 +- milena/mln/canvas/browsing/diagonal2d.hh | 43 +- .../canvas/browsing/dir_struct_elt_incr_update.hh | 44 +- milena/mln/canvas/browsing/directional.hh | 55 +- milena/mln/canvas/browsing/fwd.hh | 29 +- milena/mln/canvas/browsing/hyper_directional.hh | 9 +- milena/mln/canvas/browsing/snake_fwd.hh | 34 +- milena/mln/canvas/browsing/snake_generic.hh | 42 +- milena/mln/canvas/browsing/snake_vert.hh | 10 +- milena/mln/canvas/chamfer.hh | 4 +- milena/mln/canvas/distance_front.hh | 11 +- milena/mln/canvas/distance_geodesic.hh | 7 +- milena/mln/canvas/labeling/blobs.hh | 8 +- milena/mln/canvas/labeling/generic.hh | 11 +- milena/mln/canvas/labeling/sorted.hh | 9 +- milena/mln/canvas/labeling/video.hh | 9 +- milena/mln/canvas/morpho/attribute_filter.hh | 9 +- milena/mln/clustering/kmean_rgb.hh | 23 +- milena/mln/convert/from_to.hh | 25 +- milena/mln/convert/impl/from_double_to_value.hh | 14 +- milena/mln/convert/impl/from_float_to_value.hh | 14 +- milena/mln/convert/to_p_set.hh | 2 +- milena/mln/core/box_runend_piter.hh | 13 +- milena/mln/core/box_runstart_piter.hh | 13 +- milena/mln/core/concept/delta_point_site.hh | 16 +- milena/mln/core/concept/doc/point_iterator.hh | 5 +- milena/mln/core/concept/dpoint.hh | 25 +- milena/mln/core/concept/function.hh | 9 +- milena/mln/core/concept/gdpoint.hh | 5 +- milena/mln/core/concept/meta_accumulator.hh | 32 +- milena/mln/core/concept/neighborhood.hh | 10 +- milena/mln/core/concept/object.hh | 73 - milena/mln/core/concept/proxy.hh | 6 +- milena/mln/core/concept/pseudo_site.hh | 13 +- milena/mln/core/concept/site.hh | 8 +- milena/mln/core/concept/site_proxy.hh | 7 +- milena/mln/core/concept/site_set.hh | 15 +- milena/mln/core/dpoints_pixter.hh | 22 +- milena/mln/core/dpsites_piter.hh | 28 +- milena/mln/core/image/ch_piter.hh | 7 +- milena/mln/core/image/complex_image.hh | 13 +- .../mln/core/image/complex_neighborhood_piter.hh | 13 +- milena/mln/core/image/complex_window_piter.hh | 14 +- milena/mln/core/image/dmorph/extended.hh | 7 +- milena/mln/core/image/dmorph/extension_fun.hh | 7 +- milena/mln/core/image/dmorph/extension_ima.hh | 7 +- milena/mln/core/image/dmorph/extension_val.hh | 7 +- milena/mln/core/image/dmorph/hexa.hh | 14 +- milena/mln/core/image/dmorph/hexa_piter.hh | 19 +- milena/mln/core/image/dmorph/image2d_h.hh | 3 +- milena/mln/core/image/dmorph/image_if.hh | 8 +- milena/mln/core/image/dmorph/p2p_image.hh | 8 +- milena/mln/core/image/dmorph/slice_image.hh | 7 +- milena/mln/core/image/dmorph/sub_image.hh | 7 +- milena/mln/core/image/dmorph/sub_image_if.hh | 7 +- milena/mln/core/image/dmorph/transformed_image.hh | 9 +- milena/mln/core/image/dmorph/unproject_image.hh | 8 +- milena/mln/core/image/edge_image.hh | 7 +- milena/mln/core/image/flat_image.hh | 7 +- milena/mln/core/image/graph_window_if_piter.hh | 5 +- milena/mln/core/image/graph_window_piter.hh | 34 +- milena/mln/core/image/image1d.hh | 5 +- milena/mln/core/image/image2d.hh | 18 +- milena/mln/core/image/image3d.hh | 5 +- milena/mln/core/image/imorph/decorated_image.hh | 8 +- milena/mln/core/image/imorph/interpolated.hh | 7 +- milena/mln/core/image/imorph/labeled_image.hh | 7 +- milena/mln/core/image/imorph/lazy_image.hh | 8 +- milena/mln/core/image/imorph/plain.hh | 9 +- milena/mln/core/image/imorph/safe.hh | 9 +- milena/mln/core/image/imorph/tr_image.hh | 8 +- milena/mln/core/image/vertex_image.hh | 8 +- milena/mln/core/image/vmorph/cast_image.hh | 7 +- milena/mln/core/image/vmorph/fun_image.hh | 9 +- milena/mln/core/image/vmorph/thru_image.hh | 14 +- milena/mln/core/image/vmorph/violent_cast_image.hh | 9 +- milena/mln/core/internal/box_impl.hh | 12 +- milena/mln/core/internal/check/image_fastest.hh | 5 +- milena/mln/core/internal/classical_window_base.hh | 8 +- .../mln/core/internal/complex_neighborhood_base.hh | 16 +- milena/mln/core/internal/complex_window_base.hh | 24 +- milena/mln/core/internal/complex_window_p_base.hh | 24 +- milena/mln/core/internal/fixme.hh | 12 +- milena/mln/core/internal/graph_psite_base.hh | 9 +- milena/mln/core/internal/graph_window_base.hh | 10 +- milena/mln/core/internal/image_base.hh | 61 +- milena/mln/core/internal/image_domain_morpher.hh | 19 +- milena/mln/core/internal/image_identity.hh | 11 +- milena/mln/core/internal/image_morpher.hh | 13 +- milena/mln/core/internal/image_primary.hh | 10 +- milena/mln/core/internal/image_value_morpher.hh | 14 +- .../mln/core/internal/is_masked_impl_selector.hh | 21 +- milena/mln/core/internal/labeled_image_base.hh | 26 +- milena/mln/core/internal/morpher_lvalue.hh | 10 +- milena/mln/core/internal/neighb_base.hh | 15 +- milena/mln/core/internal/neighb_niter_base.hh | 9 +- milena/mln/core/internal/neighb_niter_impl.hh | 97 +- milena/mln/core/internal/neighborhood_base.hh | 11 +- milena/mln/core/internal/piter_adaptor.hh | 15 +- milena/mln/core/internal/piter_identity.hh | 15 +- milena/mln/core/internal/pixel_impl.hh | 16 +- milena/mln/core/internal/pixel_iterator_base.hh | 18 +- milena/mln/core/internal/pseudo_site_base.hh | 13 +- milena/mln/core/internal/run_image.hh | 16 +- milena/mln/core/internal/set_of.hh | 26 +- .../core/internal/site_relative_iterator_base.hh | 24 +- milena/mln/core/internal/site_set_base.hh | 18 +- milena/mln/core/internal/site_set_iterator_base.hh | 20 +- milena/mln/core/internal/weighted_window_base.hh | 13 +- milena/mln/core/internal/window_base.hh | 14 +- milena/mln/core/neighb.hh | 6 +- milena/mln/core/pixter1d.hh | 13 +- milena/mln/core/pixter2d.hh | 13 +- milena/mln/core/pixter3d.hh | 13 +- milena/mln/core/routine/ops.hh | 32 +- .../core/site_set/attic/p_complex_faces_piter.hh | 17 +- milena/mln/core/site_set/attic/p_faces_piter.hh | 17 +- milena/mln/core/site_set/box_piter.hh | 31 +- milena/mln/core/site_set/complex_psite.hh | 5 +- milena/mln/core/site_set/p_array.hh | 20 +- milena/mln/core/site_set/p_complex_piter.hh | 12 +- milena/mln/core/site_set/p_edges_psite.hh | 9 +- milena/mln/core/site_set/p_graph_piter.hh | 13 +- milena/mln/core/site_set/p_if_piter.hh | 21 +- milena/mln/core/site_set/p_n_faces_piter.hh | 22 +- milena/mln/core/site_set/p_run_piter.hh | 17 +- milena/mln/core/site_set/p_transformed_piter.hh | 27 +- milena/mln/core/site_set/p_vertices_psite.hh | 10 +- milena/mln/core/window.hh | 4 +- milena/mln/data/abs.hh | 13 +- milena/mln/data/apply.hh | 7 +- milena/mln/data/compare.hh | 58 +- milena/mln/data/compute.hh | 58 +- milena/mln/data/compute_in_window.hh | 42 +- milena/mln/data/convert.hh | 15 +- milena/mln/data/fast_median.hh | 9 +- milena/mln/data/fill.hh | 7 +- milena/mln/data/median.hh | 9 +- milena/mln/data/paste.hh | 37 +- milena/mln/data/paste_without_localization.hh | 20 +- milena/mln/data/replace.hh | 8 +- milena/mln/data/saturate.hh | 15 +- milena/mln/data/split.hh | 17 +- milena/mln/data/stretch.hh | 8 +- milena/mln/data/to_enc.hh | 5 +- milena/mln/data/transform.hh | 10 +- milena/mln/data/update.hh | 8 +- milena/mln/data/wrap.hh | 9 +- milena/mln/debug/draw_graph.hh | 70 +- milena/mln/debug/filename.hh | 33 +- milena/mln/debug/format.hh | 25 +- milena/mln/debug/histo.hh | 6 +- milena/mln/debug/iota.hh | 15 +- milena/mln/debug/mosaic.hh | 5 +- milena/mln/debug/println.hh | 13 +- milena/mln/debug/println_with_border.hh | 7 +- milena/mln/debug/put_word.hh | 9 +- milena/mln/debug/quiet.hh | 8 +- milena/mln/debug/slices_2d.hh | 14 +- milena/mln/debug/superpose.hh | 39 +- milena/mln/debug/z_order.hh | 8 +- milena/mln/draw/box.hh | 25 +- milena/mln/draw/box_plain.hh | 26 +- milena/mln/draw/dashed_line.hh | 33 +- milena/mln/draw/line.hh | 32 +- milena/mln/draw/plot.hh | 22 +- milena/mln/draw/polygon.hh | 31 +- milena/mln/draw/site_set.hh | 25 +- milena/mln/extension/adjust.hh | 31 +- milena/mln/extension/adjust_duplicate.hh | 20 +- milena/mln/extension/adjust_fill.hh | 20 +- milena/mln/extension/duplicate.hh | 10 +- milena/mln/extension/fill.hh | 9 +- milena/mln/fun/c.hh | 13 +- milena/mln/fun/internal/ch_function_value_impl.hh | 8 +- milena/mln/fun/v2v/ch_function_value.hh | 5 +- milena/mln/fun/v2v/hsl_to_rgb.hh | 10 +- milena/mln/fun/v2v/rgb8_to_rgbn.hh | 7 +- milena/mln/fun/v2v/round.hh | 77 + milena/mln/fun/v2v/round_sat.hh | 84 + milena/mln/fun/x2v/bilinear.hh | 2 +- milena/mln/fun/x2v/trilinear.hh | 16 +- milena/mln/fun/x2x/composed.hh | 14 +- milena/mln/fun/x2x/rotation.hh | 65 +- milena/mln/geom/all.hh | 4 +- milena/mln/geom/bbox.hh | 25 +- milena/mln/geom/bottom_left.hh | 160 + milena/mln/geom/chamfer.hh | 9 +- milena/mln/geom/complex_geometry.hh | 14 +- milena/mln/geom/crop.hh | 7 +- milena/mln/geom/crop_without_localization.hh | 8 +- milena/mln/geom/delta.hh | 18 +- milena/mln/geom/horizontal_symmetry.hh | 9 +- milena/mln/geom/max_col.hh | 14 +- milena/mln/geom/max_ind.hh | 8 +- milena/mln/geom/max_row.hh | 14 +- milena/mln/geom/max_sli.hh | 7 +- milena/mln/geom/min_col.hh | 14 +- milena/mln/geom/min_ind.hh | 8 +- milena/mln/geom/min_row.hh | 14 +- milena/mln/geom/min_sli.hh | 7 +- milena/mln/geom/ncols.hh | 12 +- milena/mln/geom/ninds.hh | 8 +- milena/mln/geom/nrows.hh | 12 +- milena/mln/geom/nsites.hh | 8 +- milena/mln/geom/nslis.hh | 9 +- milena/mln/geom/pmin_pmax.hh | 34 +- milena/mln/geom/rotate.hh | 88 +- milena/mln/geom/seeds2tiling.hh | 25 +- milena/mln/geom/seeds2tiling_roundness.hh | 31 +- milena/mln/geom/top_right.hh | 160 + milena/mln/geom/translate.hh | 45 +- milena/mln/geom/vertical_symmetry.hh | 9 +- milena/mln/histo/equalize.hh | 66 +- milena/mln/io/cloud/load.hh | 14 +- milena/mln/io/cloud/save.hh | 14 +- milena/mln/io/dicom/get_header.hh | 13 +- milena/mln/io/dicom/load.hh | 7 +- milena/mln/io/dump/get_header.hh | 9 +- milena/mln/io/dump/load.hh | 14 +- milena/mln/io/dump/save.hh | 15 +- milena/mln/io/fits/load.hh | 31 +- milena/mln/io/fld/header.hh | 9 +- milena/mln/io/fld/load.hh | 16 +- milena/mln/io/fld/load_header.hh | 16 +- milena/mln/io/fld/max_components.hh | 6 +- milena/mln/io/fld/save.hh | 4 + milena/mln/io/fld/write_header.hh | 15 +- milena/mln/io/magick/load.hh | 8 +- milena/mln/io/magick/save.hh | 11 +- milena/mln/io/off/load.hh | 24 +- milena/mln/io/off/save.hh | 30 +- milena/mln/io/pbm/load.hh | 31 +- milena/mln/io/pbm/save.hh | 6 +- milena/mln/io/pbms/load.hh | 16 +- milena/mln/io/pdf/get_header.hh | 123 + milena/mln/io/pdf/load.hh | 341 ++ milena/mln/io/pfm/load.hh | 31 +- milena/mln/io/pgm/load.hh | 35 +- milena/mln/io/pgm/save.hh | 6 +- milena/mln/io/pgms/load.hh | 17 +- milena/mln/io/plot/load.hh | 34 +- milena/mln/io/plot/save.hh | 16 +- milena/mln/io/ppm/load.hh | 36 +- milena/mln/io/ppm/save.hh | 7 +- milena/mln/io/ppms/load.hh | 16 +- milena/mln/io/raw/get_header.hh | 13 +- milena/mln/io/raw/load.hh | 24 +- milena/mln/io/raw/save.hh | 25 +- milena/mln/io/tiff/load.hh | 9 +- milena/mln/io/txt/save.hh | 15 +- milena/mln/labeling/blobs.hh | 18 +- milena/mln/labeling/blobs_and_compute.hh | 7 +- milena/mln/labeling/colorize.hh | 6 +- milena/mln/labeling/compute.hh | 61 +- milena/mln/labeling/value_and_compute.hh | 4 +- milena/mln/linear/#ch_convolve.hh# | 103 + milena/mln/linear/.#ch_convolve.hh | 1 + milena/mln/linear/convolve.hh | 28 +- milena/mln/linear/convolve_2x1d.hh | 19 +- milena/mln/linear/convolve_directional.hh | 27 +- milena/mln/linear/gaussian.hh | 17 +- milena/mln/linear/gaussian_1d.hh | 7 +- milena/mln/linear/gaussian_directional_2d.hh | 4 +- milena/mln/linear/lap.hh | 13 +- milena/mln/linear/local/convolve.hh | 39 +- milena/mln/linear/log.hh | 13 +- milena/mln/linear/sobel_2d.hh | 17 +- milena/mln/logical/and.hh | 7 +- milena/mln/logical/and_not.hh | 13 +- milena/mln/logical/not.hh | 11 +- milena/mln/logical/or.hh | 13 +- milena/mln/logical/xor.hh | 13 +- milena/mln/make/h_mat.hh | 38 +- milena/mln/make/influence_zone_adjacency_graph.hh | 4 +- milena/mln/math/abs.hh | 25 +- milena/mln/math/acos.hh | 6 +- milena/mln/math/cos.hh | 6 +- milena/mln/math/diff_abs.hh | 7 +- milena/mln/math/jacobi.hh | 5 +- milena/mln/math/max.hh | 6 +- milena/mln/math/min.hh | 6 +- milena/mln/math/pi.hh | 8 +- milena/mln/math/round.hh | 49 +- milena/mln/math/round_sat.hh | 63 +- milena/mln/math/sign.hh | 6 +- milena/mln/math/sin.hh | 8 +- milena/mln/math/sqr.hh | 6 +- milena/mln/math/sqrt.hh | 6 +- milena/mln/metal/ands.hh | 10 +- milena/mln/metal/bexpr.hh | 31 +- milena/mln/metal/bool.hh | 13 +- milena/mln/metal/converts_to.hh | 8 +- milena/mln/metal/equal.hh | 11 +- milena/mln/metal/goes_to.hh | 15 +- milena/mln/metal/if.hh | 13 +- milena/mln/metal/int.hh | 8 +- milena/mln/metal/is.hh | 11 +- milena/mln/metal/is_a.hh | 39 +- milena/mln/metal/is_not.hh | 13 +- milena/mln/metal/is_not_a.hh | 8 +- milena/mln/morpho/Rd.hh | 9 +- milena/mln/morpho/algebraic_filter.hh | 5 +- milena/mln/morpho/approx/dilation.hh | 20 +- milena/mln/morpho/approx/erosion.hh | 20 +- milena/mln/morpho/closing/algebraic.hh | 7 +- milena/mln/morpho/closing/area.hh | 8 +- milena/mln/morpho/closing/area_on_vertices.hh | 23 +- milena/mln/morpho/closing/height.hh | 5 +- milena/mln/morpho/closing/leveling.hh | 8 +- milena/mln/morpho/closing/structural.hh | 13 +- milena/mln/morpho/closing/sum.hh | 8 +- milena/mln/morpho/closing/volume.hh | 8 +- milena/mln/morpho/complementation.hh | 17 +- milena/mln/morpho/contrast.hh | 9 +- milena/mln/morpho/dilation.hh | 8 +- milena/mln/morpho/erosion.hh | 7 +- milena/mln/morpho/gradient.hh | 30 +- milena/mln/morpho/hit_or_miss.hh | 29 +- milena/mln/morpho/laplacian.hh | 12 +- milena/mln/morpho/leveling_filter.hh | 7 +- milena/mln/morpho/line_gradient.hh | 10 +- milena/mln/morpho/meyer_wst.hh | 19 +- milena/mln/morpho/min.hh | 17 +- milena/mln/morpho/minus.hh | 10 +- milena/mln/morpho/opening/algebraic.hh | 27 +- milena/mln/morpho/opening/approx/structural.hh | 12 +- milena/mln/morpho/opening/area.hh | 8 +- milena/mln/morpho/opening/area_on_vertices.hh | 23 +- milena/mln/morpho/opening/height.hh | 8 +- milena/mln/morpho/opening/leveling.hh | 27 +- milena/mln/morpho/opening/structural.hh | 12 +- milena/mln/morpho/opening/volume.hh | 8 +- milena/mln/morpho/plus.hh | 9 +- milena/mln/morpho/rank_filter.hh | 8 +- milena/mln/morpho/skeleton_constrained.hh | 8 +- milena/mln/morpho/thick_miss.hh | 7 +- milena/mln/morpho/thickening.hh | 11 +- milena/mln/morpho/thin_fit.hh | 9 +- milena/mln/morpho/thinning.hh | 13 +- milena/mln/morpho/top_hat.hh | 40 +- milena/mln/morpho/tree/filter/all.hh | 5 +- milena/mln/morpho/watershed/flooding.hh | 64 +- milena/mln/norm/l1.hh | 11 +- milena/mln/norm/l2.hh | 15 +- milena/mln/norm/linfty.hh | 12 +- milena/mln/pw/image.hh | 8 +- milena/mln/pw/internal/image_base.hh | 13 +- milena/mln/registration/icp.hh | 21 +- milena/mln/subsampling/antialiased.hh | 4 +- .../topo/adj_higher_dim_connected_n_face_iter.hh | 26 +- milena/mln/topo/adj_higher_face_iter.hh | 26 +- .../topo/adj_lower_dim_connected_n_face_iter.hh | 27 +- milena/mln/topo/adj_lower_face_iter.hh | 26 +- milena/mln/topo/adj_lower_higher_face_iter.hh | 25 +- milena/mln/topo/adj_m_face_iter.hh | 33 +- milena/mln/topo/attic/faces_iter.hh | 25 +- milena/mln/topo/center_only_iter.hh | 35 +- milena/mln/topo/centered_iter_adapter.hh | 29 +- milena/mln/topo/complex.hh | 88 +- milena/mln/topo/face_data.hh | 5 +- milena/mln/topo/face_iter.hh | 24 +- milena/mln/topo/internal/complex_iterator_base.hh | 14 +- .../internal/complex_relative_iterator_base.hh | 47 +- .../internal/complex_relative_iterator_sequence.hh | 24 +- .../mln/topo/internal/complex_set_iterator_base.hh | 13 +- milena/mln/topo/is_simple_2d.hh | 6 +- milena/mln/topo/n_face_iter.hh | 23 +- milena/mln/topo/skeleton/is_simple_point.hh | 6 +- milena/mln/topo/static_n_face_iter.hh | 31 +- milena/mln/trait/ch_function_value.hh | 5 +- milena/mln/trait/image/props.hh | 10 +- milena/mln/trait/images.hh | 4 +- milena/mln/trait/neighborhood.hh | 30 +- milena/mln/trait/promote.hh | 17 +- milena/mln/trait/site_set/props.hh | 180 +- milena/mln/trait/site_sets.hh | 26 +- milena/mln/trait/solve.hh | 22 +- milena/mln/trait/window/props.hh | 73 +- milena/mln/trait/windows.hh | 29 +- .../distance_and_closest_point_geodesic.hh | 55 +- .../distance_and_influence_zone_geodesic.hh | 28 +- milena/mln/transform/distance_front.hh | 7 +- milena/mln/transform/distance_geodesic.hh | 7 +- milena/mln/transform/hough.hh | 30 +- milena/mln/transform/influence_zone_front.hh | 11 +- milena/mln/transform/influence_zone_geodesic.hh | 18 +- .../transform/influence_zone_geodesic_saturated.hh | 29 +- milena/mln/upscaling/art/scale2x.hh | 4 +- milena/mln/upscaling/art/scale3x.hh | 4 +- milena/mln/util/branch_iter.hh | 17 +- milena/mln/util/branch_iter_ind.hh | 17 +- milena/mln/util/edge.hh | 5 +- milena/mln/util/graph.hh | 9 +- milena/mln/util/internal/edge_impl.hh | 32 +- milena/mln/util/internal/graph_base.hh | 7 +- milena/mln/util/internal/graph_iter.hh | 27 +- milena/mln/util/internal/vertex_impl.hh | 27 +- milena/mln/util/lemmings.hh | 6 +- milena/mln/util/line_graph.hh | 7 +- milena/mln/util/site_pair.hh | 9 +- milena/mln/util/vertex.hh | 7 +- milena/mln/value/builtin/integers.hh | 4 +- milena/mln/value/internal/value_like.hh | 15 +- milena/mln/value/viter.hh | 23 +- milena/mln/world/rgb/invert.hh | 5 +- milena/tests/algebra/h_mat.cc | 52 +- milena/tests/img/example-0.ppm | 6 + milena/tests/img/example-1.ppm | 6 + milena/tests/img/example-2.ppm | 6 + milena/tests/img/example-3.ppm | 6 + milena/tests/img/example.pdf | Bin 0 -> 202744 bytes milena/tests/io/Makefile.am | 6 +- milena/tests/io/pdf/Makefile.am | 26 + milena/tests/io/pdf/load.cc | 88 + milena/tests/linear/convolve.cc | 8 +- milena/tests/linear/convolve_2x1d.cc | 6 +- milena/tests/linear/convolve_directional.cc | 10 +- milena/tests/make/h_mat.cc | 38 +- milena/tests/unit_test/unit-tests.mk | 7 + scribo/ChangeLog | 1064 ++++++ scribo/Makefile.am | 2 +- scribo/demo/Makefile.am | 4 - scribo/demo/demat/demat.pro | 42 - scribo/demo/demat/demat.qrc | 4 - scribo/demo/demat/src/doc_type.hh | 51 - scribo/demo/demat/src/main.cc | 31 - scribo/demo/demat/src/main_window.cc | 266 -- scribo/demo/demat/src/main_window.hh | 96 - scribo/demo/demat/src/mln_widgets.cc | 11 - scribo/demo/demat/src/preprocessing_task.hh | 62 - scribo/demo/demat/src/process_args.hh | 47 - scribo/demo/demat/src/runner.cc | 327 -- scribo/demo/demat/src/runner.hh | 94 - scribo/demo/demat/ui/main_window.ui | 381 -- scribo/demo/review/Makefile.am | 56 - scribo/demo/review/icons/document-open.png | Bin 1550 -> 0 bytes scribo/demo/review/icons/edit-find.png | Bin 1636 -> 0 bytes scribo/demo/review/icons/format-indent-more.png | Bin 766 -> 0 bytes scribo/demo/review/icons/go-next.png | Bin 1219 -> 0 bytes scribo/demo/review/icons/image-x-generic.png | Bin 1163 -> 0 bytes scribo/demo/review/icons/list-add.png | Bin 601 -> 0 bytes scribo/demo/review/icons/ocr.png | Bin 14929 -> 0 bytes scribo/demo/review/icons/text-x-generic.png | Bin 744 -> 0 bytes scribo/demo/review/icons/view-refresh.png | Bin 2024 -> 0 bytes scribo/demo/review/icons/x-office-spreadsheet.png | Bin 1518 -> 0 bytes scribo/demo/review/mainwindow.ui | 340 -- scribo/demo/review/review.qrc | 13 - scribo/demo/review/src/main.cc | 49 - scribo/demo/review/src/mainwindow.cc | 569 --- scribo/demo/review/src/mainwindow.hh | 139 - scribo/demo/shared/icons/Symbols-Delete-icon.png | Bin 3704 -> 0 bytes scribo/demo/shared/icons/accept-icon.png | Bin 4858 -> 0 bytes scribo/demo/shared/icons/close.gif | Bin 340 -> 0 bytes scribo/demo/shared/icons/crop-icon.png | Bin 228 -> 0 bytes scribo/demo/shared/icons/image-add-icon.png | Bin 2917 -> 0 bytes scribo/demo/shared/icons/image-edit-icon.png | Bin 2305 -> 0 bytes scribo/demo/shared/icons/image-multi-icon.png | Bin 2033 -> 0 bytes scribo/demo/shared/icons/image-next-icon.png | Bin 3008 -> 0 bytes scribo/demo/shared/icons/image-remove-icon.png | Bin 3127 -> 0 bytes scribo/demo/shared/icons/next-icon.png | Bin 4611 -> 0 bytes scribo/demo/shared/icons/olena_smaller.jpg | Bin 8028 -> 0 bytes scribo/demo/shared/icons/page-down-icon.png | Bin 3450 -> 0 bytes scribo/demo/shared/icons/page-search-icon.png | Bin 3101 -> 0 bytes scribo/demo/shared/icons/rotate_ccw.png | Bin 4200 -> 0 bytes scribo/demo/shared/icons/rotate_cw.png | Bin 4161 -> 0 bytes scribo/demo/shared/icons/search-add-icon.png | Bin 4274 -> 0 bytes scribo/demo/shared/icons/search-remove-icon.png | Bin 4196 -> 0 bytes scribo/demo/shared/shared.qrc | 21 - scribo/demo/shared/src/bak/crop_item.cc | 332 -- scribo/demo/shared/src/bak/crop_item.hh | 100 - scribo/demo/shared/src/bak/image_viewer.cc | 242 -- scribo/demo/shared/src/bak/image_viewer.hh | 116 - scribo/demo/shared/src/bak/types.hh | 50 - scribo/demo/shared/src/browse_widget.cc | 72 - scribo/demo/shared/src/browse_widget.hh | 78 - scribo/demo/shared/src/crop_item.cc | 396 -- scribo/demo/shared/src/crop_item.hh | 119 - scribo/demo/shared/src/image_viewer.cc | 410 --- scribo/demo/shared/src/image_viewer.hh | 148 - scribo/demo/shared/src/image_viewer.hxx | 31 - .../shared/src/internal.bak/interactive_scene.cc | 286 -- .../shared/src/internal.bak/interactive_scene.hh | 108 - .../shared/src/internal.bak/selection_rectangle.cc | 241 -- .../shared/src/internal.bak/selection_rectangle.hh | 91 - .../demo/shared/src/internal/interactive_scene.cc | 94 - .../demo/shared/src/internal/interactive_scene.hh | 85 - .../shared/src/internal/selection_rectangle.cc | 241 -- .../shared/src/internal/selection_rectangle.hh | 91 - scribo/demo/shared/src/to_mln_image.hh | 77 - scribo/demo/shared/src/types.hh | 50 - scribo/demo/shared/ui/browse_widget.ui | 106 - scribo/demo/shared/ui/crop_widget.ui | 34 - scribo/demo/shared/ui/image_viewer.ui | 296 -- scribo/demo/shared/ui/interactive_scene.cc | 143 - scribo/demo/shared/ui/interactive_scene.hh | 87 - scribo/demo/shared/ui/rotate_widget.ui | 34 - scribo/demo/tip/gui.pro | 19 - scribo/demo/tip/gui.qrc | 9 - scribo/demo/tip/icons/next.png | Bin 3337 -> 0 bytes scribo/demo/tip/icons/ok.png | Bin 3953 -> 0 bytes scribo/demo/tip/icons/photos.png | Bin 3750 -> 0 bytes scribo/demo/tip/icons/prev.png | Bin 3334 -> 0 bytes scribo/demo/tip/icons/remove.png | Bin 3704 -> 0 bytes scribo/demo/tip/src/custom_delegate.cc | 105 - scribo/demo/tip/src/custom_delegate.hh | 81 - scribo/demo/tip/src/launch_dialog.cc | 94 - scribo/demo/tip/src/launch_dialog.hh | 63 - scribo/demo/tip/src/main.cc | 46 - scribo/demo/tip/src/main_window.cc | 526 --- scribo/demo/tip/src/main_window.hh | 119 - scribo/demo/tip/ui/launch_dialog.ui | 117 - scribo/demo/tip/ui/main_window.ui | 656 ---- scribo/demo/viewer/PagesWidget/pageswidget.cc | 2 +- scribo/demo/viewer/main.cc | 7 +- scribo/demo/viewer/mainwindow.cc | 614 ++-- scribo/demo/viewer/mainwindow.hh | 1 - scribo/demo/viewer/xml.cc | 38 +- scribo/demo/viewer/xml.hh | 1 + scribo/demo/wizard/images/dematerialization.png | Bin 76309 -> 0 bytes scribo/demo/wizard/src/crop_page.cc | 48 - scribo/demo/wizard/src/crop_page.hh | 60 - scribo/demo/wizard/src/crop_widget.cc | 37 - scribo/demo/wizard/src/crop_widget.hh | 62 - scribo/demo/wizard/src/doc_type.hh | 51 - scribo/demo/wizard/src/doc_type_page.cc | 48 - scribo/demo/wizard/src/doc_type_page.hh | 61 - scribo/demo/wizard/src/doc_type_widget.cc | 38 - scribo/demo/wizard/src/doc_type_widget.hh | 64 - scribo/demo/wizard/src/load_page.cc | 71 - scribo/demo/wizard/src/load_page.hh | 67 - scribo/demo/wizard/src/load_widget.cc | 56 - scribo/demo/wizard/src/load_widget.hh | 64 - scribo/demo/wizard/src/main.cc | 28 - scribo/demo/wizard/src/main_window.cc | 144 - scribo/demo/wizard/src/main_window.hh | 72 - scribo/demo/wizard/src/mln_widgets.cc | 7 - scribo/demo/wizard/src/preprocessing_page.cc | 61 - scribo/demo/wizard/src/preprocessing_page.hh | 66 - scribo/demo/wizard/src/preprocessing_task.hh | 61 - scribo/demo/wizard/src/preprocessing_widget.cc | 93 - scribo/demo/wizard/src/preprocessing_widget.hh | 65 - scribo/demo/wizard/src/process_page.cc | 68 - scribo/demo/wizard/src/process_page.hh | 64 - scribo/demo/wizard/src/process_widget.cc | 80 - scribo/demo/wizard/src/process_widget.hh | 71 - scribo/demo/wizard/src/result_page.cc | 43 - scribo/demo/wizard/src/result_page.hh | 60 - scribo/demo/wizard/src/result_widget.cc | 43 - scribo/demo/wizard/src/result_widget.hh | 58 - scribo/demo/wizard/src/rotate_page.cc | 45 - scribo/demo/wizard/src/rotate_page.hh | 60 - scribo/demo/wizard/src/rotate_widget.cc | 38 - scribo/demo/wizard/src/rotate_widget.hh | 62 - scribo/demo/wizard/src/runner.cc | 296 -- scribo/demo/wizard/src/runner.hh | 84 - scribo/demo/wizard/src/test.cc | 16 - scribo/demo/wizard/ui/doc_type_widget.ui | 115 - scribo/demo/wizard/ui/load_widget.ui | 110 - scribo/demo/wizard/ui/main_window.ui | 216 -- scribo/demo/wizard/ui/preprocessing_widget.ui | 223 -- scribo/demo/wizard/wizard.pro | 71 - scribo/demo/wizard/wizard.qrc | 5 - scribo/doc/.gitignore | 13 + scribo/doc/Doxyfile.in | 379 ++ scribo/doc/DoxygenLayout.xml | 188 + scribo/doc/Makefile.am | 256 ++ {milena => scribo}/doc/doxyfuns.sty | 0 .../doc/examples-outputs.mk | 0 scribo/doc/examples.mk | 4 + .../doc/examples/dummy.cc | 0 .../doc/figures.mk | 0 {milena => scribo}/doc/gen-examples-outputs-mk | 0 {milena => scribo}/doc/gen-figures-mk | 0 {milena => scribo}/doc/gen-make-variable | 0 {milena => scribo}/doc/gen-split-examples-mk | 0 {milena => scribo}/doc/gen-split-outputs-mk | 0 {milena => scribo}/doc/graphicx.hva | 0 scribo/doc/images/comp2doc_structs.png | Bin 0 -> 162650 bytes scribo/doc/images/input_sauvola_bench.png | Bin 0 -> 162917 bytes scribo/doc/images/input_sauvola_sharpness.png | Bin 0 -> 53656 bytes scribo/doc/images/olena_mp00419c.png | Bin 0 -> 238832 bytes scribo/doc/images/olena_mp00419c_demat.png | Bin 0 -> 164445 bytes scribo/doc/images/olena_viewer1.png | Bin 0 -> 164373 bytes scribo/doc/images/output_k_0_03.png | Bin 0 -> 1142 bytes scribo/doc/images/output_k_0_34.png | Bin 0 -> 907 bytes scribo/doc/images/output_k_0_50.png | Bin 0 -> 879 bytes scribo/doc/images/output_k_0_60.png | Bin 0 -> 979 bytes scribo/doc/images/output_sauvola.png | Bin 0 -> 3959 bytes scribo/doc/images/output_sauvola_ms.png | Bin 0 -> 3529 bytes scribo/doc/images/output_sauvola_ms_split.png | Bin 0 -> 3542 bytes scribo/doc/images/src/comp2doc_structs.svg | 758 ++++ scribo/doc/mainpage.dox | 79 + scribo/doc/outputs.mk | 4 + .../doc/outputs/dummy.txt | 0 .../doc/programs-examples.mk | 0 scribo/doc/scribo.qhcp | 11 + milena/doc/milena.sty => scribo/doc/scribo.sty | 0 scribo/doc/scribo/binarization/binarization.dox | 6 + scribo/doc/scribo/binarization/niblack.dox | 6 + scribo/doc/scribo/binarization/otsu.dox | 6 + scribo/doc/scribo/binarization/sauvola.dox | 84 + scribo/doc/scribo/core/datastructures.dox | 27 + scribo/doc/scribo/debug/debug.dox | 6 + scribo/doc/scribo/filter/component_groups.dox | 6 + scribo/doc/scribo/filter/component_links.dox | 6 + scribo/doc/scribo/filter/components.dox | 6 + scribo/doc/scribo/filter/elements.dox | 6 + scribo/doc/scribo/filter/filter.dox | 6 + scribo/doc/scribo/filter/line_links.dox | 6 + scribo/doc/scribo/filter/paragraphs.dox | 6 + scribo/doc/scribo/primitive/extract/separators.dox | 6 + scribo/doc/scribo/routines.dox | 5 + scribo/doc/scribo/text/ocr.dox | 6 + scribo/doc/scribo/text/text.dox | 6 + scribo/doc/scribo/toolchain/toolchain.dox | 50 + .../doc/split-examples.mk | 0 .../doc/split-outputs.mk | 0 {milena => scribo}/doc/tools/todoxygen.sh | 0 .../doc/tutorial.tex | 0 scribo/scribo/binarization/all.hh | 12 +- scribo/scribo/binarization/global_threshold.hh | 4 +- .../internal/compute_local_threshold.hh | 224 -- .../binarization/internal/first_pass_functor.hh | 177 - .../binarization/internal/local_threshold_core.hh | 275 ++ .../binarization/internal/local_threshold_debug.hh | 21 +- .../binarization/internal/niblack_formula.hh | 13 +- .../binarization/internal/niblack_functor.hh | 134 + .../binarization/internal/niblack_functor_fast.hh | 164 + .../internal/niblack_threshold_functor.hh | 157 + .../binarization/internal/sauvola_formula.hh | 25 +- .../binarization/internal/sauvola_functor.hh | 170 + .../binarization/internal/sauvola_ms_functor.hh | 233 ++ .../internal/sauvola_threshold_functor.hh | 163 + .../scribo/binarization/internal/singh_formula.hh | 112 + .../scribo/binarization/internal/singh_functor.hh | 168 + .../scribo/binarization/internal/wolf_formula.hh | 95 + .../scribo/binarization/internal/wolf_functor.hh | 160 + .../binarization/internal/wolf_functor_fast.hh | 180 + scribo/scribo/binarization/kim.hh | 262 ++ scribo/scribo/binarization/local_threshold.hh | 27 +- scribo/scribo/binarization/niblack.hh | 122 +- scribo/scribo/binarization/niblack_fast.hh | 128 + scribo/scribo/binarization/niblack_threshold.hh | 206 +- scribo/scribo/binarization/otsu.hh | 2 + scribo/scribo/binarization/otsu_threshold.hh | 12 +- scribo/scribo/binarization/sauvola.hh | 122 +- scribo/scribo/binarization/sauvola_ms.hh | 340 ++- scribo/scribo/binarization/sauvola_ms_split.hh | 48 +- scribo/scribo/binarization/sauvola_threshold.hh | 199 +- scribo/scribo/binarization/singh.hh | 128 + scribo/scribo/binarization/wolf.hh | 198 + scribo/scribo/binarization/wolf_fast.hh | 196 + scribo/scribo/canvas/integral_browsing.hh | 31 +- scribo/scribo/core/central_sites.hh | 7 +- scribo/scribo/core/component_set.hh | 4 + scribo/scribo/core/document.hh | 7 +- scribo/scribo/core/erase_objects.hh | 6 +- scribo/scribo/core/line_links.hh | 4 +- scribo/scribo/core/line_set.hh | 7 +- scribo/scribo/core/object_groups.hh | 2 + scribo/scribo/core/object_links.hh | 4 +- scribo/scribo/core/paragraph_set.hh | 1 + scribo/scribo/debug/alignment_decision_image.hh | 13 +- scribo/scribo/debug/bboxes_enlarged_image.hh | 8 +- scribo/scribo/debug/bboxes_image.hh | 17 +- scribo/scribo/debug/char_space_image.hh | 5 +- scribo/scribo/debug/decision_image.hh | 22 +- scribo/scribo/debug/highlight_text_area.hh | 12 +- scribo/scribo/debug/line_info_image.hh | 4 + scribo/scribo/debug/linked_bboxes_image.hh | 29 +- scribo/scribo/debug/links_decision_image.hh | 12 +- scribo/scribo/debug/links_image.hh | 7 +- scribo/scribo/debug/logger.hh | 47 +- .../scribo/debug/looks_like_a_text_line_image.hh | 12 +- scribo/scribo/debug/mean_and_base_lines_image.hh | 8 +- scribo/scribo/debug/save_comp_diff.hh | 31 +- scribo/scribo/debug/save_label_image.hh | 9 +- scribo/scribo/debug/save_table_image.hh | 27 +- scribo/scribo/debug/text_areas_image.hh | 4 +- scribo/scribo/debug/text_color_image.hh | 4 + scribo/scribo/draw/bounding_box_links.hh | 38 +- scribo/scribo/estim/font_color.hh | 4 +- scribo/scribo/filter/images_in_paragraph.hh | 14 +- scribo/scribo/filter/line_links_x_height.hh | 9 + scribo/scribo/filter/object_groups_mean_width.hh | 1 + scribo/scribo/filter/object_groups_size_ratio.hh | 16 + scribo/scribo/filter/object_groups_small.hh | 9 +- scribo/scribo/filter/object_groups_with_holes.hh | 17 +- scribo/scribo/filter/object_links_aligned.hh | 6 +- scribo/scribo/filter/object_links_bbox_h_ratio.hh | 8 +- scribo/scribo/filter/object_links_bbox_overlap.hh | 6 +- scribo/scribo/filter/object_links_bbox_ratio.hh | 6 +- scribo/scribo/filter/object_links_bbox_w_ratio.hh | 9 +- .../scribo/filter/object_links_bottom_aligned.hh | 5 +- .../scribo/filter/object_links_center_aligned.hh | 11 +- scribo/scribo/filter/object_links_left_aligned.hh | 10 +- .../filter/object_links_non_aligned_simple.hh | 4 +- scribo/scribo/filter/object_links_right_aligned.hh | 5 +- scribo/scribo/filter/object_links_top_aligned.hh | 8 +- scribo/scribo/filter/objects_h_thick.hh | 4 + scribo/scribo/filter/objects_h_thin.hh | 4 + scribo/scribo/filter/objects_large.hh | 17 +- scribo/scribo/filter/objects_on_border.hh | 8 +- scribo/scribo/filter/objects_size_ratio.hh | 6 +- scribo/scribo/filter/objects_small.hh | 28 +- scribo/scribo/filter/objects_thick.hh | 14 +- scribo/scribo/filter/objects_thin.hh | 17 +- scribo/scribo/filter/objects_v_thick.hh | 12 +- scribo/scribo/filter/objects_v_thin.hh | 21 +- scribo/scribo/filter/objects_with_holes.hh | 26 +- scribo/scribo/filter/paragraphs_bbox_overlap.hh | 11 +- scribo/scribo/filter/paragraphs_in_borders.hh | 8 +- scribo/scribo/filter/paragraphs_in_image.hh | 11 +- scribo/scribo/filter/separators_in_borders.hh | 15 +- scribo/scribo/filter/separators_in_element.hh | 12 +- scribo/scribo/filter/separators_in_paragraph.hh | 26 +- scribo/scribo/filter/separators_vert_in_borders.hh | 10 +- scribo/scribo/fun/v2b/objects_large_filter.hh | 5 +- scribo/scribo/fun/v2b/objects_on_border_filter.hh | 5 +- scribo/scribo/io/img/save.hh | 25 +- scribo/scribo/io/xml/internal/page_xml_visitor.hh | 27 +- scribo/scribo/layout/internal/hist_info.hh | 68 + scribo/scribo/layout/internal/node.hh | 156 + scribo/scribo/layout/xy_cut.hh | 405 ++ scribo/scribo/make/influence_zone_graph.hh | 9 +- scribo/scribo/postprocessing/fill_object_holes.hh | 19 +- .../postprocessing/images_to_drop_capital.hh | 10 +- scribo/scribo/preprocessing/denoise.hh | 11 +- scribo/scribo/preprocessing/denoise_bg.hh | 6 +- scribo/scribo/preprocessing/denoise_fg.hh | 9 +- scribo/scribo/preprocessing/deskew_crop.hh | 13 +- .../scribo/preprocessing/homogeneous_contrast.hh | 4 +- scribo/scribo/preprocessing/split_bg_fg.hh | 8 +- scribo/scribo/primitive/extract/alignments.hh | 14 +- scribo/scribo/primitive/extract/cells.hh | 14 +- scribo/scribo/primitive/extract/components.hh | 8 +- .../primitive/extract/horizontal_separators.hh | 6 +- .../scribo/primitive/extract/lines_discontinued.hh | 26 +- .../primitive/extract/lines_h_discontinued.hh | 6 +- scribo/scribo/primitive/extract/lines_h_pattern.hh | 15 +- scribo/scribo/primitive/extract/lines_h_single.hh | 30 +- scribo/scribo/primitive/extract/lines_h_thick.hh | 5 +- .../primitive/extract/lines_h_thick_and_single.hh | 25 +- .../primitive/extract/lines_h_thick_and_thin.hh | 6 +- scribo/scribo/primitive/extract/lines_pattern.hh | 25 +- scribo/scribo/primitive/extract/lines_thick.hh | 8 +- .../primitive/extract/lines_v_discontinued.hh | 10 +- scribo/scribo/primitive/extract/lines_v_pattern.hh | 33 +- scribo/scribo/primitive/extract/lines_v_single.hh | 30 +- scribo/scribo/primitive/extract/lines_v_thick.hh | 10 +- .../primitive/extract/lines_v_thick_and_single.hh | 22 +- scribo/scribo/primitive/extract/separators.hh | 10 +- .../primitive/extract/separators_nonvisible.hh | 12 +- .../primitive/extract/vertical_separators.hh | 9 +- scribo/scribo/primitive/group/from_double_link.hh | 1 - scribo/scribo/primitive/identify.hh | 2 +- scribo/scribo/primitive/link/compute.hh | 6 +- .../scribo/primitive/link/with_single_left_link.hh | 10 +- .../with_single_left_link_dmax_ratio_aligned.hh | 10 +- .../primitive/link/with_single_right_link.hh | 8 +- .../link/with_single_right_link_bottom.hh | 10 +- .../with_single_right_link_dmax_ratio_aligned.hh | 8 +- .../primitive/link/with_single_right_link_top.hh | 6 +- scribo/scribo/subsampling/bilinear.hh | 11 +- scribo/scribo/table/align_lines_horizontaly.hh | 9 +- scribo/scribo/table/internal/align_lines.hh | 16 +- scribo/scribo/table/internal/repair_lines.hh | 9 +- scribo/scribo/table/rebuild.hh | 20 +- scribo/scribo/text/extract_lines.hh | 32 +- scribo/scribo/text/extract_lines_with_features.hh | 27 +- scribo/scribo/text/extract_lines_wo_merge.hh | 37 +- scribo/scribo/text/extract_paragraphs.hh | 13 +- scribo/scribo/text/extract_paragraphs_hdoc.hh | 7 +- scribo/scribo/text/link_lines.hh | 6 +- scribo/scribo/text/merging.hh | 26 +- scribo/scribo/text/merging_hdoc.hh | 27 +- scribo/scribo/text/recognition.hh | 30 +- scribo/scribo/toolchain/content_in_doc.hh | 23 +- scribo/scribo/toolchain/content_in_hdoc.hh | 21 +- .../toolchain/internal/content_in_doc_functor.hh | 6 + .../toolchain/internal/content_in_hdoc_functor.hh | 9 + .../toolchain/internal/text_in_doc_functor.hh | 6 + .../internal/text_in_doc_preprocess_functor.hh | 35 +- .../toolchain/internal/text_in_picture_functor.hh | 4 +- .../scribo/toolchain/internal/toolchain_functor.hh | 5 + scribo/scribo/toolchain/nepomuk/text_extraction.hh | 6 +- scribo/scribo/toolchain/text_in_doc.hh | 22 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 58 +- scribo/scribo/toolchain/text_in_picture.hh | 21 +- scribo/scribo/util/compute_sub_domains.hh | 112 + scribo/scribo/util/init_integral_image.hh | 264 ++ .../scribo/util/integral_sub_sum_sum2_functor.hh | 199 + scribo/scribo/util/integral_sum_sum2_functor.hh | 142 + .../util/integral_sum_sum2_global_min_functor.hh | 158 + scribo/src/binarization/Makefile.am | 34 +- scribo/src/binarization/global_threshold.cc | 10 +- scribo/src/binarization/kim.cc | 114 + scribo/src/binarization/niblack.cc | 20 +- scribo/src/binarization/otsu.cc | 22 +- .../binarization/pgm_niblack_threshold_image.cc | 78 + scribo/src/binarization/sauvola.cc | 23 +- scribo/src/binarization/sauvola_ms.cc | 62 +- scribo/src/binarization/sauvola_ms_debug.cc | 210 +- scribo/src/binarization/sauvola_ms_fg.cc | 38 +- scribo/src/binarization/sauvola_ms_split.cc | 42 +- scribo/src/binarization/singh.cc | 105 + scribo/src/binarization/wolf.cc | 105 + .../src/contest/hdibco-2010/sauvola_ms_hdibco.cc | 5 +- scribo/src/debug/show_lines_boldness.cc | 27 +- scribo/tests/Makefile.am | 4 +- scribo/tests/binarization/Makefile.am | 38 +- scribo/tests/binarization/kim.cc | 93 + scribo/tests/binarization/kim.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/kim_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/kim_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/kim_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/niblack.cc | 55 +- scribo/tests/binarization/niblack.ref.pbm | Bin 32884 -> 32884 bytes scribo/tests/binarization/niblack_fast.cc | 93 + scribo/tests/binarization/niblack_fast.ref.pbm | Bin 0 -> 32884 bytes .../binarization/niblack_fast_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes .../binarization/niblack_fast_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes .../binarization/niblack_fast_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes .../tests/binarization/niblack_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes .../tests/binarization/niblack_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes .../tests/binarization/niblack_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/sauvola.cc | 55 +- scribo/tests/binarization/sauvola.ref.pbm | Bin 32884 -> 32884 bytes scribo/tests/binarization/sauvola_ms.cc | 59 +- scribo/tests/binarization/sauvola_ms.ref.pbm | Bin 32884 -> 32884 bytes .../binarization/sauvola_ms_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes .../binarization/sauvola_ms_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes .../binarization/sauvola_ms_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes .../tests/binarization/sauvola_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes .../tests/binarization/sauvola_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes .../tests/binarization/sauvola_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/wolf.cc | 93 + scribo/tests/binarization/wolf.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/wolf_fast.cc | 93 + scribo/tests/binarization/wolf_fast.ref.pbm | Bin 0 -> 32884 bytes .../binarization/wolf_fast_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes .../binarization/wolf_fast_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes .../tests/binarization/wolf_fast_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/wolf_weven_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/binarization/wolf_wodd_heven.ref.pbm | Bin 0 -> 32884 bytes scribo/tests/binarization/wolf_wodd_hodd.ref.pbm | Bin 0 -> 32820 bytes scribo/tests/img/lena_weven_hodd.pgm | 5 + scribo/tests/img/lena_wodd_heven.pgm | 5 + scribo/tests/img/lena_wodd_hodd.pgm | 5 + scribo/tests/img/lines_discontinued.pbm | Bin 0 -> 5050 bytes scribo/tests/layout/Makefile.am | 22 + scribo/tests/layout/xy_cut.cc | 49 + scribo/tests/primitive/extract/Makefile.am | 12 +- .../tests/primitive/extract/lines_discontinued.cc | 91 + .../primitive/extract/lines_h_discontinued.cc | 69 + scribo/tests/primitive/extract/lines_h_pattern.cc | 51 + .../primitive/extract/lines_h_pattern.ref.pbm | Bin 0 -> 5116 bytes .../primitive/extract/lines_v_discontinued.cc | 72 + scribo/tests/primitive/extract/lines_v_pattern.cc | 51 + .../primitive/extract/lines_v_pattern.ref.pbm | 5 + scribo/tests/unit_test/unit-tests.mk | 29 +- 958 files changed, 29537 insertions(+), 17282 deletions(-) create mode 100644 doc/.gitignore create mode 100644 doc/Doxyfile.in create mode 100644 doc/DoxygenLayout.xml create mode 100644 doc/Makefile.am create mode 100644 doc/about.dox create mode 100644 doc/bibliography.dox create mode 100644 doc/contributors.dox create mode 100644 doc/doc.bib create mode 100644 doc/doc.css create mode 100644 doc/doxygen.css create mode 100644 doc/footer.html create mode 100644 doc/get_sources.dox create mode 100644 doc/header.html create mode 100644 doc/images/logo.jpg create mode 100644 doc/images/olena_layers.png create mode 100644 doc/images/olena_layers.svg create mode 100644 doc/licensing.dox create mode 100644 doc/lrde.bib create mode 100644 doc/mainpage.dox create mode 100644 doc/modules_list.dox create mode 100644 doc/olena.bib create mode 100644 doc/online_resources.dox create mode 100644 doc/subdoc_footer.html create mode 100644 doc/supported_platforms.dox create mode 100644 milena/doc/DoxygenLayout.xml delete mode 100644 milena/doc/groups/accu.hh delete mode 100644 milena/doc/groups/images.hh delete mode 100644 milena/doc/groups/main.hh delete mode 100644 milena/doc/groups/neighb.hh create mode 100644 milena/doc/img/genericity.png create mode 100644 milena/doc/img/src/2dgrid.tikz create mode 100644 milena/doc/img/src/genericity.svg create mode 100644 milena/doc/img/src/standalone.cfg create mode 100644 milena/doc/img/src/standalone.cls create mode 100644 milena/doc/img/src/ydoc.cfg create mode 100644 milena/doc/img/src/ydoc.cls create mode 100644 milena/doc/mainpage.dox create mode 100644 milena/doc/milena.qhcp create mode 100644 milena/doc/mln/accu/accu.dox create mode 100644 milena/doc/mln/canvas/canvas.dox create mode 100644 milena/doc/mln/core/image/concrete.dox create mode 100644 milena/doc/mln/core/image/domain_morpher.dox create mode 100644 milena/doc/mln/core/image/identity_morpher.dox create mode 100644 milena/doc/mln/core/image/images.dox create mode 100644 milena/doc/mln/core/image/morphers.dox create mode 100644 milena/doc/mln/core/image/value_morpher.dox create mode 100644 milena/doc/mln/core/neighb.dox rename milena/doc/{groups/site_set.hh => mln/core/site_set/site_set.dox} (100%) create mode 100644 milena/doc/mln/data/data.dox create mode 100644 milena/doc/mln/io/io.dox create mode 100644 milena/doc/mln/main.dox create mode 100644 milena/doc/mln/morpho/morpho.dox rename milena/doc/{groups/graph.hh => mln/util/graph.dox} (100%) rename milena/doc/{groups/util.hh => mln/util/util.dox} (100%) rename milena/doc/{groups/win.hh => mln/win/win.dox} (100%) create mode 100644 milena/mln/fun/v2v/round.hh create mode 100644 milena/mln/fun/v2v/round_sat.hh create mode 100644 milena/mln/geom/bottom_left.hh create mode 100644 milena/mln/geom/top_right.hh create mode 100644 milena/mln/io/pdf/get_header.hh create mode 100644 milena/mln/io/pdf/load.hh create mode 100644 milena/mln/linear/#ch_convolve.hh# create mode 120000 milena/mln/linear/.#ch_convolve.hh create mode 100644 milena/tests/img/example-0.ppm create mode 100644 milena/tests/img/example-1.ppm create mode 100644 milena/tests/img/example-2.ppm create mode 100644 milena/tests/img/example-3.ppm create mode 100644 milena/tests/img/example.pdf create mode 100644 milena/tests/io/pdf/Makefile.am create mode 100644 milena/tests/io/pdf/load.cc delete mode 100644 scribo/demo/demat/demat.pro delete mode 100644 scribo/demo/demat/demat.qrc delete mode 100644 scribo/demo/demat/src/doc_type.hh delete mode 100644 scribo/demo/demat/src/main.cc delete mode 100644 scribo/demo/demat/src/main_window.cc delete mode 100644 scribo/demo/demat/src/main_window.hh delete mode 100644 scribo/demo/demat/src/mln_widgets.cc delete mode 100644 scribo/demo/demat/src/preprocessing_task.hh delete mode 100644 scribo/demo/demat/src/process_args.hh delete mode 100644 scribo/demo/demat/src/runner.cc delete mode 100644 scribo/demo/demat/src/runner.hh delete mode 100644 scribo/demo/demat/ui/main_window.ui delete mode 100644 scribo/demo/review/Makefile.am delete mode 100644 scribo/demo/review/icons/document-open.png delete mode 100644 scribo/demo/review/icons/edit-find.png delete mode 100644 scribo/demo/review/icons/format-indent-more.png delete mode 100644 scribo/demo/review/icons/go-next.png delete mode 100644 scribo/demo/review/icons/image-x-generic.png delete mode 100644 scribo/demo/review/icons/list-add.png delete mode 100644 scribo/demo/review/icons/ocr.png delete mode 100644 scribo/demo/review/icons/text-x-generic.png delete mode 100644 scribo/demo/review/icons/view-refresh.png delete mode 100644 scribo/demo/review/icons/x-office-spreadsheet.png delete mode 100644 scribo/demo/review/mainwindow.ui delete mode 100644 scribo/demo/review/review.qrc delete mode 100644 scribo/demo/review/src/main.cc delete mode 100644 scribo/demo/review/src/mainwindow.cc delete mode 100644 scribo/demo/review/src/mainwindow.hh delete mode 100644 scribo/demo/shared/icons/Symbols-Delete-icon.png delete mode 100644 scribo/demo/shared/icons/accept-icon.png delete mode 100644 scribo/demo/shared/icons/close.gif delete mode 100644 scribo/demo/shared/icons/crop-icon.png delete mode 100644 scribo/demo/shared/icons/image-add-icon.png delete mode 100644 scribo/demo/shared/icons/image-edit-icon.png delete mode 100644 scribo/demo/shared/icons/image-multi-icon.png delete mode 100644 scribo/demo/shared/icons/image-next-icon.png delete mode 100644 scribo/demo/shared/icons/image-remove-icon.png delete mode 100644 scribo/demo/shared/icons/next-icon.png delete mode 100644 scribo/demo/shared/icons/olena_smaller.jpg delete mode 100644 scribo/demo/shared/icons/page-down-icon.png delete mode 100644 scribo/demo/shared/icons/page-search-icon.png delete mode 100644 scribo/demo/shared/icons/rotate_ccw.png delete mode 100644 scribo/demo/shared/icons/rotate_cw.png delete mode 100644 scribo/demo/shared/icons/search-add-icon.png delete mode 100644 scribo/demo/shared/icons/search-remove-icon.png delete mode 100644 scribo/demo/shared/shared.qrc delete mode 100644 scribo/demo/shared/src/bak/crop_item.cc delete mode 100644 scribo/demo/shared/src/bak/crop_item.hh delete mode 100644 scribo/demo/shared/src/bak/image_viewer.cc delete mode 100644 scribo/demo/shared/src/bak/image_viewer.hh delete mode 100644 scribo/demo/shared/src/bak/types.hh delete mode 100644 scribo/demo/shared/src/browse_widget.cc delete mode 100644 scribo/demo/shared/src/browse_widget.hh delete mode 100644 scribo/demo/shared/src/crop_item.cc delete mode 100644 scribo/demo/shared/src/crop_item.hh delete mode 100644 scribo/demo/shared/src/image_viewer.cc delete mode 100644 scribo/demo/shared/src/image_viewer.hh delete mode 100644 scribo/demo/shared/src/image_viewer.hxx delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal.bak/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal.bak/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.cc delete mode 100644 scribo/demo/shared/src/internal/interactive_scene.hh delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.cc delete mode 100644 scribo/demo/shared/src/internal/selection_rectangle.hh delete mode 100644 scribo/demo/shared/src/to_mln_image.hh delete mode 100644 scribo/demo/shared/src/types.hh delete mode 100644 scribo/demo/shared/ui/browse_widget.ui delete mode 100644 scribo/demo/shared/ui/crop_widget.ui delete mode 100644 scribo/demo/shared/ui/image_viewer.ui delete mode 100644 scribo/demo/shared/ui/interactive_scene.cc delete mode 100644 scribo/demo/shared/ui/interactive_scene.hh delete mode 100644 scribo/demo/shared/ui/rotate_widget.ui delete mode 100644 scribo/demo/tip/gui.pro delete mode 100644 scribo/demo/tip/gui.qrc delete mode 100644 scribo/demo/tip/icons/next.png delete mode 100644 scribo/demo/tip/icons/ok.png delete mode 100644 scribo/demo/tip/icons/photos.png delete mode 100644 scribo/demo/tip/icons/prev.png delete mode 100644 scribo/demo/tip/icons/remove.png delete mode 100644 scribo/demo/tip/src/custom_delegate.cc delete mode 100644 scribo/demo/tip/src/custom_delegate.hh delete mode 100644 scribo/demo/tip/src/launch_dialog.cc delete mode 100644 scribo/demo/tip/src/launch_dialog.hh delete mode 100644 scribo/demo/tip/src/main.cc delete mode 100644 scribo/demo/tip/src/main_window.cc delete mode 100644 scribo/demo/tip/src/main_window.hh delete mode 100644 scribo/demo/tip/ui/launch_dialog.ui delete mode 100644 scribo/demo/tip/ui/main_window.ui delete mode 100644 scribo/demo/wizard/images/dematerialization.png delete mode 100644 scribo/demo/wizard/src/crop_page.cc delete mode 100644 scribo/demo/wizard/src/crop_page.hh delete mode 100644 scribo/demo/wizard/src/crop_widget.cc delete mode 100644 scribo/demo/wizard/src/crop_widget.hh delete mode 100644 scribo/demo/wizard/src/doc_type.hh delete mode 100644 scribo/demo/wizard/src/doc_type_page.cc delete mode 100644 scribo/demo/wizard/src/doc_type_page.hh delete mode 100644 scribo/demo/wizard/src/doc_type_widget.cc delete mode 100644 scribo/demo/wizard/src/doc_type_widget.hh delete mode 100644 scribo/demo/wizard/src/load_page.cc delete mode 100644 scribo/demo/wizard/src/load_page.hh delete mode 100644 scribo/demo/wizard/src/load_widget.cc delete mode 100644 scribo/demo/wizard/src/load_widget.hh delete mode 100644 scribo/demo/wizard/src/main.cc delete mode 100644 scribo/demo/wizard/src/main_window.cc delete mode 100644 scribo/demo/wizard/src/main_window.hh delete mode 100644 scribo/demo/wizard/src/mln_widgets.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_page.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_task.hh delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.cc delete mode 100644 scribo/demo/wizard/src/preprocessing_widget.hh delete mode 100644 scribo/demo/wizard/src/process_page.cc delete mode 100644 scribo/demo/wizard/src/process_page.hh delete mode 100644 scribo/demo/wizard/src/process_widget.cc delete mode 100644 scribo/demo/wizard/src/process_widget.hh delete mode 100644 scribo/demo/wizard/src/result_page.cc delete mode 100644 scribo/demo/wizard/src/result_page.hh delete mode 100644 scribo/demo/wizard/src/result_widget.cc delete mode 100644 scribo/demo/wizard/src/result_widget.hh delete mode 100644 scribo/demo/wizard/src/rotate_page.cc delete mode 100644 scribo/demo/wizard/src/rotate_page.hh delete mode 100644 scribo/demo/wizard/src/rotate_widget.cc delete mode 100644 scribo/demo/wizard/src/rotate_widget.hh delete mode 100644 scribo/demo/wizard/src/runner.cc delete mode 100644 scribo/demo/wizard/src/runner.hh delete mode 100644 scribo/demo/wizard/src/test.cc delete mode 100644 scribo/demo/wizard/ui/doc_type_widget.ui delete mode 100644 scribo/demo/wizard/ui/load_widget.ui delete mode 100644 scribo/demo/wizard/ui/main_window.ui delete mode 100644 scribo/demo/wizard/ui/preprocessing_widget.ui delete mode 100644 scribo/demo/wizard/wizard.pro delete mode 100644 scribo/demo/wizard/wizard.qrc create mode 100644 scribo/doc/.gitignore create mode 100644 scribo/doc/Doxyfile.in create mode 100644 scribo/doc/DoxygenLayout.xml create mode 100644 scribo/doc/Makefile.am copy {milena => scribo}/doc/doxyfuns.sty (100%) copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/examples-outputs.mk (100%) create mode 100644 scribo/doc/examples.mk copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/examples/dummy.cc (100%) copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/figures.mk (100%) copy {milena => scribo}/doc/gen-examples-outputs-mk (100%) copy {milena => scribo}/doc/gen-figures-mk (100%) copy {milena => scribo}/doc/gen-make-variable (100%) copy {milena => scribo}/doc/gen-split-examples-mk (100%) copy {milena => scribo}/doc/gen-split-outputs-mk (100%) copy {milena => scribo}/doc/graphicx.hva (100%) create mode 100644 scribo/doc/images/comp2doc_structs.png create mode 100644 scribo/doc/images/input_sauvola_bench.png create mode 100644 scribo/doc/images/input_sauvola_sharpness.png create mode 100644 scribo/doc/images/olena_mp00419c.png create mode 100644 scribo/doc/images/olena_mp00419c_demat.png create mode 100644 scribo/doc/images/olena_viewer1.png create mode 100644 scribo/doc/images/output_k_0_03.png create mode 100644 scribo/doc/images/output_k_0_34.png create mode 100644 scribo/doc/images/output_k_0_50.png create mode 100644 scribo/doc/images/output_k_0_60.png create mode 100644 scribo/doc/images/output_sauvola.png create mode 100644 scribo/doc/images/output_sauvola_ms.png create mode 100644 scribo/doc/images/output_sauvola_ms_split.png create mode 100644 scribo/doc/images/src/comp2doc_structs.svg create mode 100644 scribo/doc/mainpage.dox create mode 100644 scribo/doc/outputs.mk copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/outputs/dummy.txt (100%) copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/programs-examples.mk (100%) create mode 100644 scribo/doc/scribo.qhcp copy milena/doc/milena.sty => scribo/doc/scribo.sty (100%) create mode 100644 scribo/doc/scribo/binarization/binarization.dox create mode 100644 scribo/doc/scribo/binarization/niblack.dox create mode 100644 scribo/doc/scribo/binarization/otsu.dox create mode 100644 scribo/doc/scribo/binarization/sauvola.dox create mode 100644 scribo/doc/scribo/core/datastructures.dox create mode 100644 scribo/doc/scribo/debug/debug.dox create mode 100644 scribo/doc/scribo/filter/component_groups.dox create mode 100644 scribo/doc/scribo/filter/component_links.dox create mode 100644 scribo/doc/scribo/filter/components.dox create mode 100644 scribo/doc/scribo/filter/elements.dox create mode 100644 scribo/doc/scribo/filter/filter.dox create mode 100644 scribo/doc/scribo/filter/line_links.dox create mode 100644 scribo/doc/scribo/filter/paragraphs.dox create mode 100644 scribo/doc/scribo/primitive/extract/separators.dox create mode 100644 scribo/doc/scribo/routines.dox create mode 100644 scribo/doc/scribo/text/ocr.dox create mode 100644 scribo/doc/scribo/text/text.dox create mode 100644 scribo/doc/scribo/toolchain/toolchain.dox copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/split-examples.mk (100%) copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/split-outputs.mk (100%) copy {milena => scribo}/doc/tools/todoxygen.sh (100%) copy milena/doc/outputs/accu-right-instantiation.txt => scribo/doc/tutorial.tex (100%) delete mode 100644 scribo/scribo/binarization/internal/compute_local_threshold.hh delete mode 100644 scribo/scribo/binarization/internal/first_pass_functor.hh create mode 100644 scribo/scribo/binarization/internal/local_threshold_core.hh create mode 100644 scribo/scribo/binarization/internal/niblack_functor.hh create mode 100644 scribo/scribo/binarization/internal/niblack_functor_fast.hh create mode 100644 scribo/scribo/binarization/internal/niblack_threshold_functor.hh create mode 100644 scribo/scribo/binarization/internal/sauvola_functor.hh create mode 100644 scribo/scribo/binarization/internal/sauvola_ms_functor.hh create mode 100644 scribo/scribo/binarization/internal/sauvola_threshold_functor.hh create mode 100644 scribo/scribo/binarization/internal/singh_formula.hh create mode 100644 scribo/scribo/binarization/internal/singh_functor.hh create mode 100644 scribo/scribo/binarization/internal/wolf_formula.hh create mode 100644 scribo/scribo/binarization/internal/wolf_functor.hh create mode 100644 scribo/scribo/binarization/internal/wolf_functor_fast.hh create mode 100644 scribo/scribo/binarization/kim.hh create mode 100644 scribo/scribo/binarization/niblack_fast.hh create mode 100644 scribo/scribo/binarization/singh.hh create mode 100644 scribo/scribo/binarization/wolf.hh create mode 100644 scribo/scribo/binarization/wolf_fast.hh create mode 100644 scribo/scribo/layout/internal/hist_info.hh create mode 100644 scribo/scribo/layout/internal/node.hh create mode 100644 scribo/scribo/layout/xy_cut.hh create mode 100644 scribo/scribo/util/compute_sub_domains.hh create mode 100644 scribo/scribo/util/init_integral_image.hh create mode 100644 scribo/scribo/util/integral_sub_sum_sum2_functor.hh create mode 100644 scribo/scribo/util/integral_sum_sum2_functor.hh create mode 100644 scribo/scribo/util/integral_sum_sum2_global_min_functor.hh create mode 100644 scribo/src/binarization/kim.cc create mode 100644 scribo/src/binarization/pgm_niblack_threshold_image.cc create mode 100644 scribo/src/binarization/singh.cc create mode 100644 scribo/src/binarization/wolf.cc create mode 100644 scribo/tests/binarization/kim.cc create mode 100644 scribo/tests/binarization/kim.ref.pbm create mode 100644 scribo/tests/binarization/kim_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/kim_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/kim_wodd_hodd.ref.pbm create mode 100644 scribo/tests/binarization/niblack_fast.cc create mode 100644 scribo/tests/binarization/niblack_fast.ref.pbm create mode 100644 scribo/tests/binarization/niblack_fast_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/niblack_fast_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/niblack_fast_wodd_hodd.ref.pbm create mode 100644 scribo/tests/binarization/niblack_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/niblack_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/niblack_wodd_hodd.ref.pbm create mode 100644 scribo/tests/binarization/sauvola_ms_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/sauvola_ms_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/sauvola_ms_wodd_hodd.ref.pbm create mode 100644 scribo/tests/binarization/sauvola_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/sauvola_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/sauvola_wodd_hodd.ref.pbm create mode 100644 scribo/tests/binarization/wolf.cc create mode 100644 scribo/tests/binarization/wolf.ref.pbm create mode 100644 scribo/tests/binarization/wolf_fast.cc create mode 100644 scribo/tests/binarization/wolf_fast.ref.pbm create mode 100644 scribo/tests/binarization/wolf_fast_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/wolf_fast_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/wolf_fast_wodd_hodd.ref.pbm create mode 100644 scribo/tests/binarization/wolf_weven_hodd.ref.pbm create mode 100644 scribo/tests/binarization/wolf_wodd_heven.ref.pbm create mode 100644 scribo/tests/binarization/wolf_wodd_hodd.ref.pbm create mode 100644 scribo/tests/img/lena_weven_hodd.pgm create mode 100644 scribo/tests/img/lena_wodd_heven.pgm create mode 100644 scribo/tests/img/lena_wodd_hodd.pgm create mode 100644 scribo/tests/img/lines_discontinued.pbm create mode 100644 scribo/tests/layout/Makefile.am create mode 100644 scribo/tests/layout/xy_cut.cc create mode 100644 scribo/tests/primitive/extract/lines_discontinued.cc create mode 100644 scribo/tests/primitive/extract/lines_h_discontinued.cc create mode 100644 scribo/tests/primitive/extract/lines_h_pattern.cc create mode 100644 scribo/tests/primitive/extract/lines_h_pattern.ref.pbm create mode 100644 scribo/tests/primitive/extract/lines_v_discontinued.cc create mode 100644 scribo/tests/primitive/extract/lines_v_pattern.cc create mode 100644 scribo/tests/primitive/extract/lines_v_pattern.ref.pbm hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

branch unstable/scribo updated: olena-2.0-384-geffa1b7

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 unstable/scribo has been updated via effa1b7572027494c649d84e43bd0d066b8317e4 (commit) from 8587fe0a3705ed9c0d0c13fe4920e1fd2be79166 (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 ----------------------------------------------------------------- effa1b7 Fix namespace ambiguities. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 +++++++ scribo/scribo/make/text_components_image.hh | 5 +++-- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 9 months

olena-2.0-384-geffa1b7 Fix namespace ambiguities.

by Guillaume Lazzara

* scribo/make/text_components_image.hh, * scribo/primitive/extract/non_text.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/make/text_components_image.hh | 5 +++-- scribo/scribo/primitive/extract/non_text.hh | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index aff1b17..81b1d34 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2013-03-08 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix namespace ambiguities. + + * scribo/make/text_components_image.hh, + * scribo/primitive/extract/non_text.hh: Here. + +2013-03-08 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/table/internal/align_lines.hh: Update use of math::round. 2013-03-08 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/make/text_components_image.hh b/scribo/scribo/make/text_components_image.hh index 1a30a04..fc0243c 100644 --- a/scribo/scribo/make/text_components_image.hh +++ b/scribo/scribo/make/text_components_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -77,7 +78,7 @@ namespace scribo for_all_lines(l, doc.lines()) if (lines(l).is_textline()) { - const util::array<component_id_t>& + const mln::util::array<component_id_t>& comp_ids = lines(l).component_ids(); const L& lbl = lines.components().labeled_image(); for_all_elements(c, comp_ids) diff --git a/scribo/scribo/primitive/extract/non_text.hh b/scribo/scribo/primitive/extract/non_text.hh index 4c6d69e..2e19bc0 100644 --- a/scribo/scribo/primitive/extract/non_text.hh +++ b/scribo/scribo/primitive/extract/non_text.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -306,7 +306,7 @@ namespace scribo trace::entering("scribo::primitive::extract::non_text"); - util::timer t; + mln::util::timer t; t.start(); mln_precondition(doc.is_valid()); -- 1.7.2.5

11 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches March 2013