- Olena-patches

olena-2.0-393-gadcbc82 [ICDAR_13] Externalize XML handler
by Anthony Seure 20 Mar '13

20 Mar '13

--- scribo/sandbox/icdar_13_table/Makefile | 2 +- scribo/sandbox/icdar_13_table/src/new.cc | 51 +++++++----------------------- scribo/sandbox/icdar_13_table/src/xml.cc | 31 ++++++++++++++++++ scribo/sandbox/icdar_13_table/src/xml.hh | 24 ++++++++++++++ 4 files changed, 68 insertions(+), 40 deletions(-) create mode 100644 scribo/sandbox/icdar_13_table/src/xml.cc create mode 100644 scribo/sandbox/icdar_13_table/src/xml.hh diff --git a/scribo/sandbox/icdar_13_table/Makefile b/scribo/sandbox/icdar_13_table/Makefile index 8155a34..8d0cd1a 100644 --- a/scribo/sandbox/icdar_13_table/Makefile +++ b/scribo/sandbox/icdar_13_table/Makefile @@ -4,7 +4,7 @@ CFLAGS=-Wall -Werror -O3 -DHAVE_TESSERACT_3 -DNDEBUG CLIBS=-I../../../milena/ -I../../ -I/usr/include/poppler CLEAN=*.o output/* log final.xml -SRC=src/new.cc +SRC=src/xml.cc src/new.cc SRC_OLD=src/main.cc OUTPUT=table OUTPUT_OLD=old diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index 54b9f3b..95bf575 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -1,3 +1,5 @@ +#include "xml.hh" + // INCLUDES OLENA #include <mln/binarization/all.hh> @@ -83,38 +85,6 @@ void write_image(const image2d<value::rgb8>& ima, ++number; } -// Open and initialize XML -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; -} - -// Finalize an close XML -void end_xml(std::ofstream& xml) -{ - xml << "</document>" << std::endl; - xml.close(); -} - -// Write a new (simple) table in XML file -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 - << "\t</table>" << std::endl; - - ++table; -} - // Draw vertical links from top to bottom (red) void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, image2d<value::rgb8>& ima_groups, @@ -142,8 +112,8 @@ void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[1] == b2.pmin()[1] || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap - && abs(p1[1] - p2[1]) < 20) // Vertical proximity + && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap + && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity { draw::line(ima_groups, p1, p2, literal::red); balance[i] += 1; @@ -181,8 +151,8 @@ void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, && (b1.pmin()[1] == b2.pmin()[1] || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap - && abs(p1[1] - p2[1]) < 20) // Vertical proximity + && (unsigned) abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap + && (unsigned) abs(p1[1] - p2[1]) < 20) // Vertical proximity { draw::line(ima_groups, p1, p2, literal::red); balance[i] += 1; @@ -261,7 +231,7 @@ int main(int argc, char** argv) typedef value::label_16 V; typedef image2d<V> L; - std::ofstream xml; + //std::ofstream xml; std::ostringstream path; image2d<value::rgb8> original, ima_links, ima_groups, ima_valid; image2d<value::int_u8> filtered; @@ -271,7 +241,8 @@ int main(int argc, char** argv) unsigned dpi = 72; // Loading and binarization - start_xml(xml, "final.xml", argv[1]); + //start_xml(xml, "final.xml", argv[1]); + XML* xml = new XML("final.xml", argv[1]); util::array< image2d<value::rgb8> > pdf; io::pdf::load(pdf, argv[1], dpi); @@ -424,7 +395,9 @@ int main(int argc, char** argv) write_image(ima_valid, "valid", page, number, path); } - end_xml(xml); + + //end_xml(xml); + delete xml; return 0; } diff --git a/scribo/sandbox/icdar_13_table/src/xml.cc b/scribo/sandbox/icdar_13_table/src/xml.cc new file mode 100644 index 0000000..76fed84 --- /dev/null +++ b/scribo/sandbox/icdar_13_table/src/xml.cc @@ -0,0 +1,31 @@ +#include "xml.hh" + +XML::XML(const char* name, const char* pdf) + : _name(name), _pdf(pdf) +{ + _xml.open(_name); + _xml << "<?xml version\"1.0\" encoding=\"UTF-8\"?>" << std::endl + << "<document filename='" << _pdf << "'>" << std::endl; +} + +XML::~XML() +{ + _xml << "</document>" << std::endl; + _xml.close(); +} + +void XML::write_table(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 + << "\t</table>" << std::endl; + + ++table; +} diff --git a/scribo/sandbox/icdar_13_table/src/xml.hh b/scribo/sandbox/icdar_13_table/src/xml.hh new file mode 100644 index 0000000..397d585 --- /dev/null +++ b/scribo/sandbox/icdar_13_table/src/xml.hh @@ -0,0 +1,24 @@ +#ifndef XML_HH +# define XML_HH +# define MLN_WO_GLOBAL_VARS + +# include <iostream> +# include <fstream> +# include <mln/core/alias/point2d.hh> + +using namespace mln; + +class XML +{ + public: + XML(const char* name, const char* pdf); + ~XML(); + void write_table(const point2d& start, const point2d& end); + + private: + std::ofstream _xml; + const char* _name; + const char* _pdf; +}; + +#endif /* !XML_HH */ -- 1.7.2.5

1 0

olena-2.0-392-gf4c521e [ICDAR] Externalize some functions
by Anthony Seure 19 Mar '13

19 Mar '13

--- scribo/sandbox/icdar_13_table/TODO | 3 +- scribo/sandbox/icdar_13_table/src/new.cc | 281 ++++++++++++++++++++---------- 2 files changed, 190 insertions(+), 94 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/TODO b/scribo/sandbox/icdar_13_table/TODO index e3c6f52..86486c9 100644 --- a/scribo/sandbox/icdar_13_table/TODO +++ b/scribo/sandbox/icdar_13_table/TODO @@ -4,9 +4,10 @@ Table location sub-competition : * Find links betwwen pages for mutlipages tables - * Get text from reversed-video zones * *** glibc detected *** ./table: corrupted double-linked list with the file us-005.pdf from the test set + * 'Floating point exeption' using sauvola_ms(a, b, c) with a floating point + c instead of an unsigned (Z is working on it) Table structure recognition sub-competition : * All diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index aca31bb..54b9f3b 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -53,6 +53,36 @@ using namespace mln; +// Write image2d<bool> images +void write_image(const image2d<bool>& ima, + const char* name, + const unsigned page, + unsigned& number, + std::ostringstream& path) +{ + path.str(""); + path << "output/p" << page + << "_" << number + << "_" << name << ".pbm"; + io::pbm::save(ima, path.str()); + ++number; +} + +// Write image2d<value::rbg8> images +void write_image(const image2d<value::rgb8>& ima, + const char* name, + const unsigned page, + unsigned& number, + std::ostringstream& path) +{ + path.str(""); + path << "output/p" << page + << "_" << number + << "_" << name << ".ppm"; + io::ppm::save(ima, path.str()); + ++number; +} + // Open and initialize XML void start_xml(std::ofstream& xml, const char* name, const char* pdf) { @@ -85,10 +115,147 @@ void write_table(std::ofstream& xml, const point2d& start, const point2d& end) ++table; } - /********/ - /* MAIN */ - /********/ +// Draw vertical links from top to bottom (red) +void draw_links_tb(const scribo::object_groups< image2d<unsigned> >& groups, + image2d<value::rgb8>& ima_groups, + std::vector<short>& balance, + unsigned average_width) +{ + for (unsigned i = 1; i <= groups.nelements(); ++i) + { + for (unsigned j = 1; j <= groups.nelements(); ++j) + { + if (i != j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + unsigned max_height = std::max(b1.height(), b2.height()); + unsigned min_height = std::min(b1.height(), b2.height()); + + if (p1[0] < p2[0] // Avoid redundancy + && max_height * 2 < ima_groups.ncols() + && min_height + 3 >= max_height // Same heights + && b1.width() < 2 * average_width && b2.width() < 2 * average_width // Regular width + && (b1.pmin()[1] == b2.pmin()[1] + || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) + || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned + && abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap + && abs(p1[1] - p2[1]) < 20) // Vertical proximity + { + draw::line(ima_groups, p1, p2, literal::red); + balance[i] += 1; + break; + } + } + } + } +} + +// Draw vertical links from bottom to top (red) +void draw_links_bt(const scribo::object_groups< image2d<unsigned> >& groups, + image2d<value::rgb8>& ima_groups, + std::vector<short>& balance, + unsigned average_width) +{ + for (unsigned i = groups.nelements(); i > 0; --i) + { + for (unsigned j = groups.nelements(); j > 0; --j) + { + if (i != j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + unsigned max_height = std::max(b1.height(), b2.height()); + unsigned min_height = std::min(b1.height(), b2.height()); + + if (p1[0] > p2[0] // Avoid redundancy + && max_height * 2 < ima_groups.ncols() + && min_height + 3 >= max_height // Same heights + && b1.width() < 2 * average_width && b2.width() < 2 * average_width // Regular width + && (b1.pmin()[1] == b2.pmin()[1] + || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) + || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned + && abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap + && abs(p1[1] - p2[1]) < 20) // Vertical proximity + { + draw::line(ima_groups, p1, p2, literal::red); + balance[i] += 1; + break; + } + } + } + } +} + +// Draw horizontal links from left to right (green) +void draw_links_lr(const scribo::object_groups< image2d<unsigned> >& groups, + image2d<value::rgb8>& ima_groups, + std::vector<short>& balance) +{ + for (unsigned i = 1; i <= groups.nelements(); ++i) + { + for (unsigned j = 1; j <= groups.nelements(); ++j) + { + if (i != j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + if (p1[1] < p2[1] // Avoid redundancy + && (b1.pmin()[0] == b2.pmin()[0] + || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) + || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned + && abs(p1[0] - p2[0]) < 10) // Reduced gap + { + draw::line(ima_groups, p1, p2, literal::green); + balance[i] += 1; + break; + } + } + } + } +} + +// Draw horizontal links from right to left (green) +void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, + image2d<value::rgb8>& ima_groups, + std::vector<short>& balance) +{ + for (unsigned i = groups.nelements(); i > 0; --i) + { + for (unsigned j = groups.nelements(); j > 0; --j) + { + if (i != j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + const point2d& p1 = b1.pcenter(); + const point2d& p2 = b2.pcenter(); + + if (p1[1] > p2[1] // Avoid redundancy + && (b1.pmin()[0] == b2.pmin()[0] + || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) + || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned + && abs(p1[0] - p2[0]) < 10) // Reduced gap + { + draw::line(ima_groups, p1, p2, literal::green); + balance[i] += 1; + break; + } + } + } + } +} +/******************************** MAIN ****************************************/ int main(int argc, char** argv) { typedef value::label_16 V; @@ -108,6 +275,7 @@ int main(int argc, char** argv) util::array< image2d<value::rgb8> > pdf; io::pdf::load(pdf, argv[1], dpi); + for (unsigned page = 0; page < pdf.nelements(); ++page) { original = pdf[page]; @@ -219,66 +387,11 @@ int main(int argc, char** argv) std::vector<short> balance(groups.nelements(), 0); - // Draw vertical links (red) - for (unsigned i = 1; i < groups.nelements(); ++i) - { - for (unsigned j = 1; j < groups.nelements(); ++j) - { - if (i != j) - { - const box2d& b1 = groups(i).bbox(); - const box2d& b2 = groups(j).bbox(); - const point2d& p1 = b1.pcenter(); - const point2d& p2 = b2.pcenter(); - - unsigned max_height = std::max(b1.height(), b2.height()); - unsigned min_height = std::min(b1.height(), b2.height()); - - if (p1[0] < p2[0] // Avoid redundancy - && max_height * 2 < bin_merged.ncols() - && min_height + 3 >= max_height // Same heights - && b1.width() < 2 * average_width && b2.width() < 2 * average_width // Regular width - && (b1.pmin()[1] == b2.pmin()[1] - || (b1.pmin()[1] < b2.pmin()[1] && b1.pmax()[1] > b2.pmin()[1]) - || (b1.pmin()[1] > b2.pmin()[1] && b2.pmax()[1] > b1.pmin()[1])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 3 * max_height // Reduced gap - && abs(p1[1] - p2[1]) < 20) // Vertical proximity - { - draw::line(ima_groups, p1, p2, literal::red); - balance[i] += 1; - balance[j] += 1; - break; - } - } - } - } - - // Draw horizontal links (green) - for (unsigned i = 1; i < groups.nelements(); ++i) - { - for (unsigned j = 1; j < groups.nelements(); ++j) - { - if (i != j) - { - const box2d& b1 = groups(i).bbox(); - const box2d& b2 = groups(j).bbox(); - const point2d& p1 = b1.pcenter(); - const point2d& p2 = b2.pcenter(); - - if (p1[1] < p2[1] // Avoid redundancy - && (b1.pmin()[0] == b2.pmin()[0] - || (b1.pmin()[0] < b2.pmin()[0] && b1.pmax()[0] > b2.pmin()[0]) - || (b1.pmin()[0] > b2.pmin()[0] && b2.pmax()[0] > b1.pmin()[0])) // Boxes are aligned - && abs(p1[0] - p2[0]) < 10) // Reduced gap - { - draw::line(ima_groups, p1, p2, literal::green); - balance[i] += 1; - balance[j] += 1; - break; - } - } - } - } + // Draw and count links + draw_links_tb(groups, ima_groups, balance, average_width); + draw_links_bt(groups, ima_groups, balance, average_width); + draw_links_lr(groups, ima_groups, balance); + draw_links_rl(groups, ima_groups, balance); // Draw weighted boxes (red < orange < cyan < green) (useless ?) for (unsigned i = 0; i < balance.size(); ++i) @@ -297,36 +410,18 @@ int main(int argc, char** argv) } // Write images and close XML - // FIXME To externalize - path.str(""); path << "output/p" << page << "_0_bin.pbm"; - io::pbm::save(bin, path.str()); - - path.str(""); path << "output/p" << page << "_1_bin_without_separators.pbm"; - io::pbm::save(bin_without_separators, path.str()); - - path.str(""); path << "output/p" << page << "_2_denoised.pbm"; - io::pbm::save(denoised, path.str()); - - path.str(""); path << "output/p" << page << "_3_reverse.pbm"; - io::pbm::save(reverse, path.str()); - - path.str(""); path << "output/p" << page << "_4_reverse_selection.pbm"; - io::pbm::save(reverse_selection, path.str()); - - path.str(""); path << "output/p" << page << "_5_bin_merged.pbm"; - io::pbm::save(bin_merged, path.str()); - - path.str(""); path << "output/p" << page << "_6_components.pbm"; - io::pbm::save(comp, path.str()); - - path.str(""); path << "output/p" << page << "_7_links.ppm"; - io::ppm::save(ima_links, path.str()); - - path.str(""); path << "output/p" << page << "_8_groups.ppm"; - io::ppm::save(ima_groups, path.str()); - - path.str(""); path << "output/p" << page << "_9_valid.ppm"; - io::ppm::save(ima_valid, path.str()); + unsigned number = 0; + + write_image(bin, "bin", page, number, path); + write_image(bin_without_separators, "bin_without_separators", page, number, path); + write_image(denoised, "denoised", page, number, path); + write_image(reverse, "reverse", page, number, path); + write_image(reverse_selection, "", page, number, path); + write_image(bin_merged, "reverse_selection", page, number, path); + write_image(comp, "bin_merged", page, number, path); + write_image(ima_links, "components", page, number, path); + write_image(ima_groups, "groups", page, number, path); + write_image(ima_valid, "valid", page, number, path); } end_xml(xml); -- 1.7.2.5

1 0

olena-2.0-405-gc621ab0 scribo/debug/links_image.hh: Make use of object_link interface.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

--- scribo/ChangeLog | 4 ++++ scribo/scribo/debug/links_image.hh | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f1c29f3..a58900d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/debug/links_image.hh: Make use of object_link interface. + +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/main.cc: Kill warnings. 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/debug/links_image.hh b/scribo/scribo/debug/links_image.hh index c41446f..30fb071 100644 --- a/scribo/scribo/debug/links_image.hh +++ b/scribo/scribo/debug/links_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -87,7 +88,7 @@ namespace scribo scribo::draw::bounding_boxes(links_image, comps, literal::blue); for_all_links(l, links) - if (links(l) != l) + if (links.is_linked(l)) mln::draw::line(links_image, primitive::link::internal::compute_anchor(comps, l, -- 1.7.2.5

1 0

olena-2.0-404-g7c5e9cc Merge branch 'exp/trace' into unstable/scribo
by Guillaume Lazzara 19 Mar '13

19 Mar '13

This is a merge commit message of the following branches: Merge: b6f5568 4b98621 Conflicts: scribo/ChangeLog milena/ChangeLog | 426 +++++++++++++ milena/doc/benchmark/canvas.cc | 6 +- .../examples/split/tuto3_first_routine-1.cc.raw | 3 +- .../examples/split/tuto3_first_routine-3.cc.raw | 2 +- .../examples/split/tuto3_first_routine-8.cc.raw | 1 - milena/doc/examples/split/tuto3_trace-1.cc.raw | 2 +- milena/doc/examples/split/tuto3_trace-2.cc.raw | 2 +- milena/doc/examples/trash/tuto_bis.cc | 3 +- milena/doc/examples/tuto3/first_routine.cc | 6 +- milena/doc/examples/tuto3/trace.cc | 6 +- milena/doc/outputs/accu-right-instantiation.txt | 2 + milena/doc/outputs/borderthickness.txt | 2 + milena/doc/outputs/estim-sites.txt | 2 + milena/doc/outputs/extend.txt | 31 + milena/doc/outputs/fill-call-1.txt | 8 + milena/doc/outputs/fill-imageif-cfun.txt | 10 + milena/doc/outputs/fill-part-image.txt | 18 + milena/doc/outputs/fill-subdomain-shorter.txt | 20 + milena/doc/outputs/fill-subdomain.txt | 41 ++ milena/doc/outputs/fill.txt | 4 + milena/doc/outputs/ima-load.txt | 1 + milena/doc/outputs/ima-save.txt | 1 + milena/doc/outputs/ima2d-6-clone.txt | 7 + milena/doc/outputs/ima2d-7.txt | 6 + milena/doc/outputs/ima2d-rot.txt | 32 + milena/doc/outputs/labeling-compute.txt | 19 + milena/doc/outputs/logical-not.txt | 10 + milena/doc/outputs/paste-call-1.txt | 15 + milena/doc/outputs/split/tuto3_println-1.txt | 11 + milena/doc/outputs/split/tuto3_println-2.txt | 7 + milena/doc/outputs/tuto2_first_image.txt | 7 + milena/doc/outputs/tuto3_colorize.txt | 7 + milena/doc/outputs/tuto3_first_routine.txt | 48 ++ milena/doc/outputs/tuto3_println.txt | 18 + milena/doc/outputs/tuto3_rw_image.txt | 24 + .../outputs/tuto4_genericity_and_algorithms.txt | 83 +++ milena/mln/accu/compute.hh | 9 +- milena/mln/accu/image/init.hh | 9 +- milena/mln/accu/image/set_value.hh | 18 +- milena/mln/accu/image/take.hh | 18 +- milena/mln/accu/image/take_as_init.hh | 18 +- milena/mln/accu/image/take_n_times.hh | 18 +- milena/mln/accu/image/to_result.hh | 9 +- milena/mln/accu/image/untake.hh | 18 +- milena/mln/accu/stat/histo3d_rgb.hh | 13 +- milena/mln/accu/transform.hh | 12 +- milena/mln/accu/transform_diagonal.hh | 6 +- milena/mln/accu/transform_directional.hh | 6 +- milena/mln/accu/transform_line.hh | 15 +- milena/mln/accu/transform_snake.hh | 6 +- milena/mln/accu/transform_stop.hh | 12 +- milena/mln/all.hh | 2 +- milena/mln/arith/diff_abs.hh | 3 +- milena/mln/arith/div.hh | 18 +- milena/mln/arith/div.spe.hh | 6 +- milena/mln/arith/min.hh | 16 +- milena/mln/arith/min.spe.hh | 6 +- milena/mln/arith/minus.hh | 33 +- milena/mln/arith/plus.hh | 36 +- milena/mln/arith/revert.hh | 9 +- milena/mln/arith/revert.spe.hh | 8 +- milena/mln/arith/times.hh | 18 +- milena/mln/arith/times.spe.hh | 6 +- milena/mln/binarization/binarization.hh | 6 +- milena/mln/binarization/threshold.hh | 3 +- milena/mln/border/adjust.hh | 3 +- milena/mln/border/duplicate.hh | 12 +- milena/mln/border/equalize.hh | 6 +- milena/mln/border/fill.hh | 9 +- milena/mln/border/find.hh | 3 +- milena/mln/border/get.hh | 9 +- milena/mln/border/mirror.hh | 15 +- milena/mln/border/resize.hh | 3 +- milena/mln/border/resize_equal.hh | 3 +- milena/mln/canvas/browsing/backdiagonal2d.hh | 3 +- milena/mln/canvas/browsing/diagonal2d.hh | 3 +- .../canvas/browsing/dir_struct_elt_incr_update.hh | 3 +- milena/mln/canvas/browsing/directional.hh | 3 +- milena/mln/canvas/browsing/fwd.hh | 3 +- milena/mln/canvas/browsing/hyper_directional.hh | 3 +- .../canvas/browsing/internal/graph_first_search.hh | 3 +- milena/mln/canvas/browsing/snake_fwd.hh | 3 +- milena/mln/canvas/browsing/snake_generic.hh | 3 +- milena/mln/canvas/browsing/snake_vert.hh | 3 +- milena/mln/canvas/distance_front.hh | 9 +- milena/mln/canvas/distance_geodesic.hh | 9 +- milena/mln/canvas/labeling/blobs.hh | 7 +- milena/mln/canvas/labeling/generic.hh | 9 +- milena/mln/canvas/labeling/sorted.hh | 8 +- milena/mln/canvas/labeling/video.hh | 10 +- milena/mln/canvas/morpho/attribute_filter.hh | 6 +- milena/mln/clustering/kmean_rgb.hh | 61 +-- milena/mln/convert/to.hh | 7 +- milena/mln/convert/to_qimage.hh | 3 +- milena/mln/convert/to_qimage_nocopy.hh | 3 +- milena/mln/core/concept/object.hh | 4 +- milena/mln/core/routine/duplicate.hh | 3 +- milena/mln/core/routine/initialize.hh | 7 +- milena/mln/data/abs.hh | 6 +- milena/mln/data/apply.hh | 6 +- milena/mln/data/apply.spe.hh | 3 +- milena/mln/data/approx/median.hh | 6 +- milena/mln/data/compare.hh | 9 +- milena/mln/data/compute.hh | 3 +- milena/mln/data/compute_in_window.hh | 9 +- milena/mln/data/convert.hh | 9 +- milena/mln/data/fill.hh | 3 +- milena/mln/data/fill_with_image.hh | 6 +- milena/mln/data/fill_with_image.spe.hh | 12 +- milena/mln/data/fill_with_value.hh | 6 +- milena/mln/data/fill_with_value.spe.hh | 9 +- milena/mln/data/median.hh | 9 +- milena/mln/data/memcpy_.hh | 6 +- milena/mln/data/memset_.hh | 9 +- milena/mln/data/paste.hh | 6 +- milena/mln/data/paste.spe.hh | 12 +- milena/mln/data/paste_without_localization.hh | 15 +- milena/mln/data/replace.hh | 6 +- milena/mln/data/saturate.hh | 9 +- milena/mln/data/sort_offsets.hh | 18 +- milena/mln/data/split.hh | 3 +- milena/mln/data/stretch.hh | 12 +- milena/mln/data/to_enc.hh | 3 +- milena/mln/data/transform.hh | 12 +- milena/mln/data/transform.spe.hh | 24 +- milena/mln/data/transform_inplace.hh | 30 +- milena/mln/data/update.hh | 9 +- milena/mln/data/wrap.hh | 3 +- milena/mln/debug/draw_graph.hh | 12 +- milena/mln/debug/iota.hh | 3 +- milena/mln/debug/mosaic.hh | 3 +- milena/mln/debug/println.hh | 3 +- milena/mln/debug/put_word.hh | 4 +- milena/mln/debug/slices_2d.hh | 6 +- milena/mln/debug/superpose.hh | 3 +- milena/mln/debug/trace.hh | 218 +++++++ milena/mln/debug/z_order.hh | 3 +- milena/mln/draw/dashed_line.hh | 8 +- milena/mln/draw/line.hh | 8 +- milena/mln/essential/routine.hh | 5 +- milena/mln/extension/adjust.hh | 12 +- milena/mln/extension/adjust_duplicate.hh | 12 +- milena/mln/extension/adjust_fill.hh | 12 +- milena/mln/extension/duplicate.hh | 3 +- milena/mln/extension/fill.hh | 3 +- milena/mln/fun/x2x/composed.hh | 3 +- milena/mln/geom/chamfer.hh | 3 +- milena/mln/geom/crop.hh | 3 +- milena/mln/geom/crop_without_localization.hh | 3 +- milena/mln/geom/horizontal_symmetry.hh | 3 +- milena/mln/geom/max_ind.hh | 3 +- milena/mln/geom/min_ind.hh | 3 +- milena/mln/geom/ninds.hh | 3 +- milena/mln/geom/nsites.hh | 3 +- milena/mln/geom/rotate.hh | 6 +- milena/mln/geom/seeds2tiling.hh | 6 +- milena/mln/geom/seeds2tiling_roundness.hh | 6 +- milena/mln/geom/translate.hh | 3 +- milena/mln/geom/vertical_symmetry.hh | 3 +- milena/mln/graph/compute.hh | 3 +- milena/mln/graph/labeling.hh | 3 +- milena/mln/graph/to_neighb.hh | 3 +- milena/mln/graph/to_win.hh | 3 +- milena/mln/histo/compute.hh | 3 +- milena/mln/histo/equalize.hh | 3 +- milena/mln/io/cloud/load.hh | 3 +- milena/mln/io/cloud/save.hh | 3 +- milena/mln/io/dicom/get_header.hh | 3 +- milena/mln/io/dicom/load.hh | 9 +- milena/mln/io/dump/get_header.hh | 3 +- milena/mln/io/dump/load.hh | 3 +- milena/mln/io/dump/save.hh | 3 +- milena/mln/io/fits/load.hh | 3 +- milena/mln/io/fld/load.hh | 3 +- milena/mln/io/fld/save.hh | 3 +- milena/mln/io/magick/load.hh | 4 +- milena/mln/io/magick/save.hh | 10 +- milena/mln/io/off/load.hh | 9 +- milena/mln/io/off/save.hh | 12 +- milena/mln/io/pbm/load.hh | 3 +- milena/mln/io/pbm/save.hh | 3 +- milena/mln/io/pbms/load.hh | 3 +- milena/mln/io/pdf/get_header.hh | 3 +- milena/mln/io/pdf/load.hh | 9 +- milena/mln/io/pfm/load.hh | 3 +- milena/mln/io/pfm/save.hh | 3 +- milena/mln/io/pgm/load.hh | 6 +- milena/mln/io/pgm/save.hh | 3 +- milena/mln/io/pgms/load.hh | 3 +- milena/mln/io/plot/load.hh | 3 +- milena/mln/io/plot/save.hh | 9 +- milena/mln/io/pnm/load.hh | 6 +- milena/mln/io/pnm/save.hh | 3 +- milena/mln/io/pnms/load.hh | 6 +- milena/mln/io/ppm/load.hh | 6 +- milena/mln/io/ppms/load.hh | 3 +- milena/mln/io/raw/get_header.hh | 3 +- milena/mln/io/raw/load.hh | 3 +- milena/mln/io/raw/save.hh | 3 +- milena/mln/io/svg/simple_svg_1.0.0.hh | 642 ++++++++++++++++++++ milena/mln/io/tiff/load.hh | 3 +- milena/mln/io/txt/save.hh | 3 +- milena/mln/labeling/background.hh | 3 +- milena/mln/labeling/blobs.hh | 3 +- milena/mln/labeling/blobs_and_compute.hh | 3 +- milena/mln/labeling/colorize.hh | 8 +- milena/mln/labeling/compute.hh | 30 +- milena/mln/labeling/compute_image.hh | 9 +- milena/mln/labeling/fill_holes.hh | 3 +- milena/mln/labeling/flat_zones.hh | 3 +- milena/mln/labeling/foreground.hh | 3 +- milena/mln/labeling/mean_values.hh | 9 +- milena/mln/labeling/n_max.hh | 3 +- milena/mln/labeling/pack.hh | 6 +- milena/mln/labeling/regional_maxima.hh | 3 +- milena/mln/labeling/regional_minima.hh | 3 +- milena/mln/labeling/relabel.hh | 12 +- milena/mln/labeling/superpose.hh | 3 +- milena/mln/labeling/value.hh | 3 +- milena/mln/labeling/value.spe.hh | 3 +- milena/mln/labeling/value_and_compute.hh | 3 +- milena/mln/labeling/wrap.hh | 3 +- milena/mln/linear/convolve.hh | 9 +- milena/mln/linear/convolve_2x1d.hh | 3 +- milena/mln/linear/convolve_directional.hh | 3 +- milena/mln/linear/gaussian_1d.hh | 3 +- milena/mln/linear/gaussian_directional_2d.hh | 3 +- milena/mln/linear/lap.hh | 12 +- milena/mln/linear/log.hh | 11 +- milena/mln/linear/sobel_2d.hh | 12 +- milena/mln/logical/and.hh | 6 +- milena/mln/logical/and_not.hh | 6 +- milena/mln/logical/not.hh | 6 +- milena/mln/logical/not.spe.hh | 6 +- milena/mln/logical/or.hh | 6 +- milena/mln/logical/xor.hh | 6 +- milena/mln/make/dual_neighb.hh | 3 +- milena/mln/make/dummy_p_edges.hh | 3 +- milena/mln/make/dummy_p_vertices.hh | 3 +- milena/mln/make/edge_image.hh | 18 +- milena/mln/make/influence_zone_adjacency_graph.hh | 6 +- milena/mln/make/p_edges_with_mass_centers.hh | 3 +- milena/mln/make/p_vertices_with_mass_centers.hh | 3 +- milena/mln/make/rag_and_labeled_wsl.hh | 6 +- milena/mln/make/region_adjacency_graph.hh | 6 +- milena/mln/make/relabelfun.hh | 6 +- milena/mln/make/vertex_image.hh | 6 +- milena/mln/make/w_window.hh | 3 +- milena/mln/morpho/algebraic_filter.hh | 3 +- milena/mln/morpho/approx/dilation.hh | 9 +- milena/mln/morpho/approx/erosion.hh | 9 +- milena/mln/morpho/closing/algebraic.hh | 3 +- milena/mln/morpho/closing/approx/structural.hh | 3 +- milena/mln/morpho/closing/area.hh | 3 +- milena/mln/morpho/closing/area_on_vertices.hh | 3 +- milena/mln/morpho/closing/height.hh | 3 +- milena/mln/morpho/closing/leveling.hh | 3 +- milena/mln/morpho/closing/structural.hh | 3 +- milena/mln/morpho/closing/sum.hh | 3 +- milena/mln/morpho/closing/volume.hh | 3 +- milena/mln/morpho/complementation.hh | 6 +- milena/mln/morpho/contrast.hh | 3 +- milena/mln/morpho/dilation.hh | 9 +- milena/mln/morpho/elementary/closing.hh | 3 +- milena/mln/morpho/elementary/dilation.hh | 3 +- milena/mln/morpho/elementary/erosion.hh | 3 +- milena/mln/morpho/elementary/gradient.hh | 12 +- milena/mln/morpho/elementary/gradient_external.hh | 3 +- milena/mln/morpho/elementary/gradient_internal.hh | 3 +- milena/mln/morpho/elementary/laplacian.hh | 3 +- milena/mln/morpho/elementary/like_ero_fun.hh | 6 +- milena/mln/morpho/elementary/like_ero_set.hh | 6 +- milena/mln/morpho/elementary/opening.hh | 3 +- milena/mln/morpho/elementary/top_hat.hh | 9 +- milena/mln/morpho/erosion.hh | 9 +- milena/mln/morpho/general.hh | 9 +- milena/mln/morpho/general.spe.hh | 21 +- milena/mln/morpho/gradient.hh | 9 +- milena/mln/morpho/hit_or_miss.hh | 21 +- milena/mln/morpho/laplacian.hh | 6 +- milena/mln/morpho/leveling_filter.hh | 3 +- milena/mln/morpho/line_gradient.hh | 3 +- milena/mln/morpho/meyer_wst.hh | 3 +- milena/mln/morpho/min.hh | 6 +- milena/mln/morpho/minus.hh | 3 +- milena/mln/morpho/opening/algebraic.hh | 3 +- milena/mln/morpho/opening/approx/structural.hh | 3 +- milena/mln/morpho/opening/area.hh | 3 +- milena/mln/morpho/opening/area_on_vertices.hh | 3 +- milena/mln/morpho/opening/height.hh | 3 +- milena/mln/morpho/opening/leveling.hh | 3 +- milena/mln/morpho/opening/structural.hh | 3 +- milena/mln/morpho/opening/volume.hh | 3 +- milena/mln/morpho/plus.hh | 3 +- milena/mln/morpho/rank_filter.hh | 12 +- .../reconstruction/by_dilation/union_find.hh | 6 +- .../morpho/reconstruction/by_erosion/union_find.hh | 6 +- milena/mln/morpho/skeleton_constrained.hh | 9 +- milena/mln/morpho/thick_miss.hh | 3 +- milena/mln/morpho/thickening.hh | 3 +- milena/mln/morpho/thin_fit.hh | 3 +- milena/mln/morpho/thinning.hh | 3 +- milena/mln/morpho/top_hat.hh | 9 +- milena/mln/morpho/tree/component_tree.hh | 6 +- milena/mln/morpho/tree/compute_attribute_image.hh | 6 +- milena/mln/morpho/tree/compute_parent.hh | 6 +- milena/mln/morpho/tree/dual_input_tree.hh | 3 +- milena/mln/morpho/tree/filter/direct.hh | 3 +- milena/mln/morpho/tree/filter/filter.hh | 3 +- milena/mln/morpho/tree/filter/max.hh | 3 +- milena/mln/morpho/tree/filter/min.hh | 3 +- milena/mln/morpho/tree/filter/subtractive.hh | 3 +- milena/mln/morpho/tree/impl/dual_hqueue.hh | 3 +- milena/mln/morpho/tree/impl/dual_union_find.hh | 3 +- milena/mln/morpho/tree/max.hh | 3 +- milena/mln/morpho/watershed/flooding.hh | 9 +- milena/mln/morpho/watershed/superpose.hh | 3 +- milena/mln/opt/at.hh | 5 +- milena/mln/registration/icp.hh | 3 +- milena/mln/set/card.hh | 9 +- milena/mln/set/compute.hh | 9 +- milena/mln/set/compute_with_weights.hh | 15 +- milena/mln/set/diff.hh | 3 +- milena/mln/set/get.hh | 3 +- milena/mln/set/has.hh | 3 +- milena/mln/set/inter.hh | 3 +- milena/mln/set/sym_diff.hh | 3 +- milena/mln/set/uni.hh | 3 +- milena/mln/set/unique.hh | 3 +- milena/mln/subsampling/antialiased.hh | 13 +- milena/mln/test/positive.hh | 3 +- milena/mln/test/predicate.hh | 9 +- milena/mln/topo/skeleton/crest.hh | 9 +- milena/mln/trace/all.hh | 52 -- milena/mln/trace/entering.hh | 89 --- milena/mln/trace/essential.hh | 36 -- milena/mln/trace/exiting.hh | 118 ---- milena/mln/trace/quiet.hh | 84 --- milena/mln/trace/resume.hh | 60 -- milena/mln/trace/stop.hh | 63 -- milena/mln/trace/warning.hh | 64 -- .../distance_and_closest_point_geodesic.hh | 6 +- .../distance_and_influence_zone_geodesic.hh | 3 +- milena/mln/transform/distance_front.hh | 3 +- milena/mln/transform/distance_geodesic.hh | 3 +- milena/mln/transform/hough.hh | 3 +- milena/mln/transform/influence_zone_front.hh | 3 +- milena/mln/transform/influence_zone_geodesic.hh | 6 +- .../transform/influence_zone_geodesic_saturated.hh | 3 +- milena/mln/upscaling/art/scale2x.hh | 3 +- milena/mln/upscaling/art/scale3x.hh | 3 +- milena/mln/util/tree_fast_to_image.hh | 6 +- milena/mln/util/tree_to_fast.hh | 8 +- milena/mln/util/tree_to_image.hh | 21 +- milena/mln/win/diff.hh | 3 +- milena/mln/win/inter.hh | 3 +- milena/mln/win/shift.hh | 3 +- milena/mln/win/sym.hh | 6 +- milena/mln/world/binary_2d/enlarge.hh | 3 +- milena/mln/world/binary_2d/subsample.hh | 4 +- milena/mln/world/inter_pixel/compute.hh | 3 +- .../mln/world/inter_pixel/dim2/make_edge_image.hh | 3 +- milena/mln/world/inter_pixel/full2image.hh | 3 +- milena/mln/world/inter_pixel/immerse.hh | 3 +- milena/mln/world/rgb/invert.hh | 9 +- milena/mln/world/rgb/invert.spe.hh | 9 +- milena/tests/arith/diff_abs.cc | 2 +- milena/tests/arith/minus.cc | 2 +- milena/tests/arith/plus.cc | 4 +- milena/tests/arith/revert.cc | 2 +- milena/tests/arith/times.cc | 2 +- milena/tests/data/fill_with_image.cc | 4 +- milena/tests/data/paste.cc | 4 +- milena/tests/geom/nsites.cc | 2 +- milena/tests/linear/gaussian.cc | 6 +- milena/tests/morpho/closing/algebraic.cc | 2 +- milena/tests/morpho/elementary/closing.cc | 2 +- milena/tests/morpho/elementary/dilation.cc | 2 +- milena/tests/morpho/elementary/erosion.cc | 2 +- milena/tests/morpho/elementary/opening.cc | 2 +- milena/tests/morpho/elementary/top_hat.cc | 2 +- milena/tests/morpho/general.cc | 4 +- milena/tests/morpho/opening/algebraic.cc | 2 +- milena/tests/morpho/top_hat.cc | 2 +- milena/tests/opt/at.cc | 4 +- milena/tests/opt/element.cc | 4 +- milena/tests/opt/value.cc | 5 +- milena/tests/unit_test/unit-tests.mk | 8 - scribo/ChangeLog | 302 +++++++++ scribo/demo/xml2doc/main.cc | 1 - scribo/scribo/binarization/global_threshold.hh | 3 +- .../scribo/binarization/global_threshold_auto.hh | 3 +- .../binarization/internal/local_threshold_core.hh | 9 +- scribo/scribo/binarization/kim.hh | 3 +- scribo/scribo/binarization/local_threshold.hh | 9 +- scribo/scribo/binarization/niblack.hh | 3 +- scribo/scribo/binarization/niblack_fast.hh | 3 +- scribo/scribo/binarization/niblack_threshold.hh | 3 +- scribo/scribo/binarization/otsu.hh | 2 +- scribo/scribo/binarization/otsu_threshold.hh | 3 +- scribo/scribo/binarization/sauvola.hh | 3 +- scribo/scribo/binarization/sauvola_ms.hh | 9 +- scribo/scribo/binarization/sauvola_ms_split.hh | 3 +- scribo/scribo/binarization/sauvola_threshold.hh | 3 +- scribo/scribo/binarization/singh.hh | 3 +- scribo/scribo/binarization/wolf.hh | 3 +- scribo/scribo/binarization/wolf_fast.hh | 3 +- scribo/scribo/canvas/integral_browsing.hh | 12 +- scribo/scribo/convert/from_base64.hh | 9 +- scribo/scribo/convert/to_base64.hh | 3 +- scribo/scribo/core/central_sites.hh | 3 +- scribo/scribo/core/erase_objects.hh | 3 +- scribo/scribo/core/init_integral_image.hh | 3 +- scribo/scribo/debug/alignment_decision_image.hh | 3 +- scribo/scribo/debug/bboxes_enlarged_image.hh | 3 +- scribo/scribo/debug/bboxes_image.hh | 9 +- scribo/scribo/debug/char_space_image.hh | 3 +- scribo/scribo/debug/decision_image.hh | 6 +- scribo/scribo/debug/highlight_text_area.hh | 12 +- scribo/scribo/debug/line_info_image.hh | 3 +- scribo/scribo/debug/linked_bboxes_image.hh | 9 +- scribo/scribo/debug/links_decision_image.hh | 3 +- scribo/scribo/debug/links_image.hh | 3 +- .../scribo/debug/looks_like_a_text_line_image.hh | 3 +- scribo/scribo/debug/mean_and_base_lines_image.hh | 3 +- scribo/scribo/debug/save_comp_diff.hh | 3 +- scribo/scribo/debug/save_label_image.hh | 3 +- scribo/scribo/debug/save_table_image.hh | 6 +- scribo/scribo/debug/text_areas_image.hh | 3 +- scribo/scribo/draw/bounding_box_links.hh | 9 +- scribo/scribo/draw/bounding_boxes.hh | 6 +- scribo/scribo/draw/groups_bboxes.hh | 3 +- scribo/scribo/draw/line_components.hh | 3 +- scribo/scribo/estim/components_features.hh | 3 +- scribo/scribo/estim/font_boldness.hh | 12 +- scribo/scribo/estim/font_color.hh | 9 +- scribo/scribo/estim/internal/compute_skeleton.hh | 3 +- scribo/scribo/estim/object_groups_mean_width.hh | 3 +- scribo/scribo/filter/common/objects_photo.hh | 3 +- scribo/scribo/filter/images_in_paragraph.hh | 3 +- scribo/scribo/filter/internal/alignment_angle.hh | 11 +- scribo/scribo/filter/internal/component_aligned.hh | 3 +- scribo/scribo/filter/internal/compute.hh | 6 +- scribo/scribo/filter/object_groups_mean_width.hh | 3 +- scribo/scribo/filter/object_groups_size_ratio.hh | 3 +- scribo/scribo/filter/object_groups_small.hh | 3 +- scribo/scribo/filter/object_groups_with_holes.hh | 7 +- scribo/scribo/filter/object_links_aligned.hh | 3 +- scribo/scribo/filter/object_links_bbox_h_ratio.hh | 3 +- scribo/scribo/filter/object_links_bbox_overlap.hh | 3 +- scribo/scribo/filter/object_links_bbox_ratio.hh | 3 +- scribo/scribo/filter/object_links_bbox_w_ratio.hh | 3 +- .../scribo/filter/object_links_bottom_aligned.hh | 3 +- .../scribo/filter/object_links_center_aligned.hh | 3 +- scribo/scribo/filter/object_links_left_aligned.hh | 3 +- .../filter/object_links_non_aligned_simple.hh | 3 +- scribo/scribo/filter/object_links_right_aligned.hh | 3 +- scribo/scribo/filter/object_links_top_aligned.hh | 3 +- scribo/scribo/filter/objects_h_thick.hh | 6 +- scribo/scribo/filter/objects_h_thin.hh | 6 +- scribo/scribo/filter/objects_large.hh | 6 +- scribo/scribo/filter/objects_on_border.hh | 3 +- scribo/scribo/filter/objects_size_ratio.hh | 3 +- scribo/scribo/filter/objects_small.hh | 6 +- scribo/scribo/filter/objects_thick.hh | 6 +- scribo/scribo/filter/objects_thin.hh | 6 +- scribo/scribo/filter/objects_v_thick.hh | 6 +- scribo/scribo/filter/objects_v_thin.hh | 6 +- scribo/scribo/filter/objects_with_holes.hh | 8 +- scribo/scribo/filter/paragraphs_bbox_overlap.hh | 3 +- scribo/scribo/filter/paragraphs_in_borders.hh | 3 +- scribo/scribo/filter/paragraphs_in_image.hh | 3 +- scribo/scribo/filter/separators_in_borders.hh | 3 +- scribo/scribo/filter/separators_in_element.hh | 3 +- scribo/scribo/filter/separators_in_paragraph.hh | 3 +- scribo/scribo/filter/separators_vert_in_borders.hh | 3 +- scribo/scribo/io/img/save.hh | 8 +- scribo/scribo/io/text_boxes/save.hh | 3 +- scribo/scribo/io/xml/internal/save_image_to_xml.hh | 3 +- scribo/scribo/io/xml/save.hh | 6 +- scribo/scribo/layout/xy_cut.hh | 18 +- scribo/scribo/make/debug_filename.hh | 8 +- scribo/scribo/make/influence_zone_graph.hh | 3 +- scribo/scribo/make/text_blocks_image.hh | 3 +- scribo/scribo/make/text_components_image.hh | 3 +- scribo/scribo/postprocessing/fill_object_holes.hh | 10 +- .../postprocessing/images_to_drop_capital.hh | 3 +- scribo/scribo/preprocessing/crop.hh | 3 +- .../preprocessing/crop_without_localization.hh | 3 +- scribo/scribo/preprocessing/denoise.hh | 3 +- scribo/scribo/preprocessing/denoise_bg.hh | 3 +- scribo/scribo/preprocessing/denoise_fg.hh | 3 +- scribo/scribo/preprocessing/deskew.hh | 3 +- scribo/scribo/preprocessing/deskew_crop.hh | 3 +- .../scribo/preprocessing/homogeneous_contrast.hh | 3 +- scribo/scribo/preprocessing/rotate_90.hh | 3 +- scribo/scribo/preprocessing/split_bg_fg.hh | 12 +- scribo/scribo/primitive/extract/alignments.hh | 10 +- scribo/scribo/primitive/extract/canvas.hh | 3 +- scribo/scribo/primitive/extract/cells.hh | 3 +- scribo/scribo/primitive/extract/components.hh | 6 +- .../primitive/extract/horizontal_separators.hh | 3 +- .../scribo/primitive/extract/lines_discontinued.hh | 3 +- .../primitive/extract/lines_h_discontinued.hh | 3 +- scribo/scribo/primitive/extract/lines_h_pattern.hh | 3 +- scribo/scribo/primitive/extract/lines_h_single.hh | 6 +- scribo/scribo/primitive/extract/lines_h_thick.hh | 3 +- .../primitive/extract/lines_h_thick_and_single.hh | 3 +- .../primitive/extract/lines_h_thick_and_thin.hh | 3 +- scribo/scribo/primitive/extract/lines_pattern.hh | 9 +- scribo/scribo/primitive/extract/lines_thick.hh | 3 +- .../primitive/extract/lines_v_discontinued.hh | 3 +- scribo/scribo/primitive/extract/lines_v_pattern.hh | 3 +- scribo/scribo/primitive/extract/lines_v_single.hh | 6 +- scribo/scribo/primitive/extract/lines_v_thick.hh | 3 +- .../primitive/extract/lines_v_thick_and_single.hh | 3 +- scribo/scribo/primitive/extract/non_text.hh | 3 +- scribo/scribo/primitive/extract/non_text_hdoc.hh | 3 +- scribo/scribo/primitive/extract/non_text_kmean.hh | 3 +- scribo/scribo/primitive/extract/separators.hh | 3 +- .../primitive/extract/separators_nonvisible.hh | 3 +- .../primitive/extract/vertical_separators.hh | 3 +- scribo/scribo/primitive/group/apply.hh | 6 +- scribo/scribo/primitive/group/from_double_link.hh | 3 +- .../scribo/primitive/group/from_double_link_any.hh | 3 +- scribo/scribo/primitive/group/from_graph.hh | 3 +- scribo/scribo/primitive/group/from_single_link.hh | 3 +- scribo/scribo/primitive/identify.hh | 8 +- .../scribo/primitive/internal/find_graph_link.hh | 3 +- scribo/scribo/primitive/internal/rd.hh | 6 +- .../scribo/primitive/internal/update_graph_link.hh | 3 +- scribo/scribo/primitive/link/compute.hh | 3 +- scribo/scribo/primitive/link/compute_several.hh | 3 +- .../primitive/link/internal/compute_anchor.hh | 4 +- scribo/scribo/primitive/link/merge_double_link.hh | 3 +- .../link/merge_double_link_closest_aligned.hh | 3 +- scribo/scribo/primitive/link/with_graph.hh | 3 +- scribo/scribo/primitive/link/with_rag.hh | 3 +- .../scribo/primitive/link/with_several_graphes.hh | 3 +- .../primitive/link/with_several_left_links.hh | 3 +- .../link/with_several_right_closest_links.hh | 3 +- .../primitive/link/with_several_right_links.hh | 3 +- .../link/with_several_right_links_overlap.hh | 3 +- .../scribo/primitive/link/with_single_down_link.hh | 3 +- .../scribo/primitive/link/with_single_left_link.hh | 3 +- .../link/with_single_left_link_dmax_ratio.hh | 3 +- .../with_single_left_link_dmax_ratio_aligned.hh | 3 +- .../primitive/link/with_single_right_link.hh | 3 +- .../link/with_single_right_link_bottom.hh | 3 +- .../link/with_single_right_link_dmax_ratio.hh | 3 +- .../with_single_right_link_dmax_ratio_aligned.hh | 3 +- .../primitive/link/with_single_right_link_top.hh | 3 +- .../scribo/primitive/link/with_single_up_link.hh | 3 +- scribo/scribo/primitive/merge/components.hh | 3 +- .../primitive/regroup/from_single_left_link.hh | 3 +- .../regroup/from_single_left_link_wrt_h_ratio.hh | 3 +- scribo/scribo/primitive/remove/separators.hh | 3 +- scribo/scribo/subsampling/bilinear.hh | 3 +- scribo/scribo/subsampling/integral.hh | 12 +- scribo/scribo/subsampling/integral_single_image.hh | 12 +- scribo/scribo/table/align_lines_horizontaly.hh | 3 +- scribo/scribo/table/align_lines_verticaly.hh | 3 +- scribo/scribo/table/connect_horizontal_lines.hh | 3 +- scribo/scribo/table/connect_vertical_lines.hh | 3 +- scribo/scribo/table/erase.hh | 3 +- scribo/scribo/table/extract.hh | 3 +- scribo/scribo/table/internal/align_lines.hh | 3 +- scribo/scribo/table/internal/connect_lines.hh | 3 +- scribo/scribo/table/internal/repair_lines.hh | 3 +- scribo/scribo/table/rebuild.hh | 3 +- scribo/scribo/table/repair_horizontal_lines.hh | 3 +- scribo/scribo/table/repair_vertical_lines.hh | 3 +- scribo/scribo/text/clean.hh | 3 +- scribo/scribo/text/clean_inplace.hh | 3 +- scribo/scribo/text/extract_lines.hh | 6 +- scribo/scribo/text/extract_lines_with_features.hh | 3 +- scribo/scribo/text/extract_lines_wo_merge.hh | 3 +- scribo/scribo/text/look_like_text_lines.hh | 6 +- scribo/scribo/text/paragraphs_closing.hh | 3 +- scribo/scribo/text/recognition.hh | 12 +- .../internal/text_in_doc_preprocess_functor.hh | 2 +- scribo/scribo/toolchain/nepomuk/text_extraction.hh | 3 +- scribo/scribo/toolchain/text_in_doc_preprocess.hh | 3 +- scribo/scribo/toolchain/text_in_picture.hh | 3 +- scribo/scribo/upsampling/bs2x.hh | 3 +- scribo/scribo/upsampling/eagle.hh | 3 +- scribo/scribo/util/box_intersection.hh | 3 +- scribo/scribo/util/box_is_included.hh | 3 +- scribo/scribo/util/component_precise_outline.hh | 4 +- scribo/scribo/util/compute_sub_domains.hh | 3 +- scribo/scribo/util/hex_to_color.hh | 3 +- scribo/scribo/util/init_integral_image.hh | 12 +- scribo/src/afp/regroup.hh | 5 +- scribo/src/binarization/global_threshold.cc | 3 +- scribo/src/binarization/kim.cc | 2 +- scribo/src/binarization/niblack.cc | 3 +- scribo/src/binarization/otsu.cc | 3 +- .../src/binarization/pgm_global_threshold_auto.cc | 3 +- .../binarization/pgm_niblack_threshold_image.cc | 3 +- scribo/src/binarization/sauvola.cc | 3 +- scribo/src/binarization/sauvola_debug.cc | 3 +- scribo/src/binarization/sauvola_ms.cc | 2 +- scribo/src/binarization/sauvola_ms_debug.cc | 2 +- scribo/src/binarization/sauvola_ms_fg.cc | 2 +- scribo/src/binarization/sauvola_ms_split.cc | 2 +- scribo/src/binarization/singh.cc | 3 +- scribo/src/binarization/wolf.cc | 3 +- scribo/src/content_in_doc.cc | 3 +- scribo/src/content_in_hdoc.cc | 3 +- scribo/src/contest/DAE-2011/content_in_doc_dae.cc | 3 +- scribo/src/contest/DAE-2011/content_in_hdoc_dae.cc | 3 +- .../contest/hdlac-2011/content_in_hdoc_hdlac.cc | 3 +- scribo/src/debug/highlight_text_area.cc | 3 +- .../src/debug/show_info_median_inter_characters.cc | 3 +- scribo/src/debug/show_info_x_height.cc | 3 +- scribo/src/debug/show_lines_boldness.cc | 3 +- scribo/src/debug/show_objects_large.cc | 2 +- scribo/src/debug/show_objects_large_small.cc | 2 +- scribo/src/debug/show_objects_small.cc | 2 +- scribo/src/debug/show_objects_thick.cc | 2 +- scribo/src/debug/show_objects_thin.cc | 2 +- scribo/src/debug/show_paragraph_blocks.cc | 3 +- scribo/src/debug/show_separators.cc | 3 +- scribo/src/debug/show_stoppers.cc | 3 +- scribo/src/debug/show_text_lines.cc | 3 +- scribo/src/debug/show_text_lines_wo_seps.cc | 3 +- scribo/src/filter/objects_large.cc | 3 +- scribo/src/filter/objects_small.cc | 3 +- scribo/src/filter/objects_thick.cc | 3 +- scribo/src/filter/objects_thin.cc | 3 +- scribo/src/filter/objects_with_holes.cc | 3 +- scribo/src/filter/objects_with_holes_pgm.cc | 3 +- scribo/src/misc/negate.cc | 7 +- scribo/src/misc/superpose.cc | 7 +- scribo/src/non_text_components.cc | 3 +- scribo/src/pbm_text_in_doc.cc | 3 +- scribo/src/postprocessing/fill_object_holes.cc | 3 +- scribo/src/preprocessing/denoise_bg.cc | 3 +- scribo/src/preprocessing/denoise_fg.cc | 3 +- scribo/src/preprocessing/preprocess.cc | 3 +- scribo/src/preprocessing/split_bg_fg.cc | 3 +- scribo/src/preprocessing/subsample.cc | 3 +- scribo/src/preprocessing/unskew.cc | 7 +- scribo/src/primitive/extract/alignments.cc | 3 +- .../src/primitive/extract/discontinued_hlines.cc | 3 +- scribo/src/primitive/extract/discontinued_lines.cc | 3 +- .../src/primitive/extract/discontinued_vlines.cc | 3 +- scribo/src/primitive/extract/lines_pattern.cc | 3 +- .../src/primitive/extract/separators_nonvisible.cc | 3 +- scribo/src/primitive/extract/thick_hlines.cc | 3 +- scribo/src/primitive/extract/thick_vlines.cc | 3 +- .../src/primitive/find/find_discontinued_lines.cc | 3 +- scribo/src/primitive/find/find_pattern_lines.cc | 3 +- scribo/src/primitive/find/find_single_lines.cc | 3 +- .../primitive/find/find_thick_and_single_lines.cc | 3 +- scribo/src/primitive/find/find_thick_lines.cc | 3 +- scribo/src/primitive/remove/separators.cc | 3 +- scribo/src/table/erase.cc | 3 +- scribo/src/table/extract.cc | 3 +- scribo/src/text/cleantxt.cc | 3 +- scribo/src/text/pbm_lines_recognition.cc | 3 +- scribo/src/text/pbm_recognition.cc | 3 +- scribo/src/text_in_picture.cc | 3 +- scribo/src/text_in_picture_dual.cc | 2 +- scribo/src/text_recognition_in_picture.cc | 3 +- scribo/src/util/component_precise_outline.cc | 3 +- 666 files changed, 3135 insertions(+), 2675 deletions(-) diff --cc milena/ChangeLog index 3170851,48577a2..4504e7c --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,22 -1,53 +1,70 @@@ + 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce mln_trace_warning macro. + + * mln/border/mirror.hh, + * mln/canvas/labeling/blobs.hh, + * mln/canvas/labeling/generic.hh, + * mln/canvas/labeling/sorted.hh, + * mln/canvas/labeling/video.hh, + * mln/data/stretch.hh, + * mln/debug/put_word.hh, + * mln/debug/trace.hh, + * mln/draw/dashed_line.hh, + * mln/draw/line.hh, + * mln/labeling/colorize.hh, + * mln/subsampling/antialiased.hh: Make use of this macro here. + + 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove last references to mln::trace::*. + + * mln/arith/min.hh, + * mln/clustering/kmean_rgb.hh, + * mln/world/rgb/invert.spe.hh: Remove duplicate references to + mln_trace. + + * tests/data/fill_with_image.cc, + * tests/data/paste.cc, + * tests/linear/gaussian.cc, + * tests/opt/at.cc, + * tests/opt/element.cc, + * tests/opt/value.cc: Remove useless include. + + * tests/unit_test/unit-tests.mk: Remove mln_trace_* tests. + + 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove deprecated trace system. + + * mln/trace/all.hh, + * mln/trace/entering.hh, + * mln/trace/essential.hh, + * mln/trace/exiting.hh, + * mln/trace/quiet.hh, + * mln/trace/resume.hh, + * mln/trace/stop.hh, + * mln/trace/warning.hh: Remove. + 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/trait/op/plus.cc: Kill warnings. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/internal/init_magick.hh: Add a missing inline. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make fld tests write in different files. + + * tests/io/fld/fld1d.cc, + * tests/io/fld/fld2d.cc, + * tests/io/fld/fld3d.cc: Write in different files to allow those + tests to be run simultaneously. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --cc scribo/ChangeLog index 0121ab4,e0d0731..f1c29f3 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@@ -1,7 -1,305 +1,309 @@@ 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/main.cc: Kill warnings. + ++2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> ++ + Make use of mln_trace_warning in Scribo. + + * scribo/canvas/integral_browsing.hh, + * scribo/filter/internal/alignment_angle.hh, + * scribo/io/img/save.hh, + * scribo/io/xml/save.hh, + * scribo/make/debug_filename.hh, + * scribo/primitive/extract/alignments.hh, + * scribo/primitive/link/internal/compute_anchor.hh: Here. + + 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove last references to mln::trace::*. + + * demo/xml2doc/main.cc, + * scribo/make/debug_filename.hh, + * scribo/primitive/identify.hh, + * src/afp/regroup.hh, + * src/misc/negate.cc, + * src/misc/superpose.cc, + * src/preprocessing/split_bg_fg.cc, + * src/preprocessing/unskew.cc: Here. + + 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make use of mln_trace. + + * scribo/binarization/global_threshold.hh, + * scribo/binarization/global_threshold_auto.hh, + * scribo/binarization/internal/local_threshold_core.hh, + * scribo/binarization/kim.hh, + * scribo/binarization/local_threshold.hh, + * scribo/binarization/niblack.hh, + * scribo/binarization/niblack_fast.hh, + * scribo/binarization/niblack_threshold.hh, + * scribo/binarization/otsu.hh, + * scribo/binarization/otsu_threshold.hh, + * scribo/binarization/sauvola.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/binarization/sauvola_ms_split.hh, + * scribo/binarization/sauvola_threshold.hh, + * scribo/binarization/singh.hh, + * scribo/binarization/wolf.hh, + * scribo/binarization/wolf_fast.hh, + * scribo/convert/from_base64.hh, + * scribo/convert/to_base64.hh, + * scribo/core/central_sites.hh, + * scribo/core/erase_objects.hh, + * scribo/core/init_integral_image.hh, + * scribo/debug/alignment_decision_image.hh, + * scribo/debug/bboxes_enlarged_image.hh, + * scribo/debug/bboxes_image.hh, + * scribo/debug/char_space_image.hh, + * scribo/debug/decision_image.hh, + * scribo/debug/highlight_text_area.hh, + * scribo/debug/line_info_image.hh, + * scribo/debug/linked_bboxes_image.hh, + * scribo/debug/links_decision_image.hh, + * scribo/debug/links_image.hh, + * scribo/debug/looks_like_a_text_line_image.hh, + * scribo/debug/mean_and_base_lines_image.hh, + * scribo/debug/save_comp_diff.hh, + * scribo/debug/save_label_image.hh, + * scribo/debug/save_table_image.hh, + * scribo/debug/text_areas_image.hh, + * scribo/draw/bounding_box_links.hh, + * scribo/draw/bounding_boxes.hh, + * scribo/draw/groups_bboxes.hh, + * scribo/draw/line_components.hh, + * scribo/estim/components_features.hh, + * scribo/estim/font_boldness.hh, + * scribo/estim/font_color.hh, + * scribo/estim/internal/compute_skeleton.hh, + * scribo/estim/object_groups_mean_width.hh, + * scribo/filter/common/objects_photo.hh, + * scribo/filter/images_in_paragraph.hh, + * scribo/filter/internal/alignment_angle.hh, + * scribo/filter/internal/component_aligned.hh, + * scribo/filter/internal/compute.hh, + * scribo/filter/object_groups_mean_width.hh, + * scribo/filter/object_groups_size_ratio.hh, + * scribo/filter/object_groups_small.hh, + * scribo/filter/object_groups_with_holes.hh, + * scribo/filter/object_links_aligned.hh, + * scribo/filter/object_links_bbox_h_ratio.hh, + * scribo/filter/object_links_bbox_overlap.hh, + * scribo/filter/object_links_bbox_ratio.hh, + * scribo/filter/object_links_bbox_w_ratio.hh, + * scribo/filter/object_links_bottom_aligned.hh, + * scribo/filter/object_links_center_aligned.hh, + * scribo/filter/object_links_left_aligned.hh, + * scribo/filter/object_links_non_aligned_simple.hh, + * scribo/filter/object_links_right_aligned.hh, + * scribo/filter/object_links_top_aligned.hh, + * scribo/filter/objects_h_thick.hh, + * scribo/filter/objects_h_thin.hh, + * scribo/filter/objects_large.hh, + * scribo/filter/objects_on_border.hh, + * scribo/filter/objects_size_ratio.hh, + * scribo/filter/objects_small.hh, + * scribo/filter/objects_thick.hh, + * scribo/filter/objects_thin.hh, + * scribo/filter/objects_v_thick.hh, + * scribo/filter/objects_v_thin.hh, + * scribo/filter/objects_with_holes.hh, + * scribo/filter/paragraphs_bbox_overlap.hh, + * scribo/filter/paragraphs_in_borders.hh, + * scribo/filter/paragraphs_in_image.hh, + * scribo/filter/separators_in_borders.hh, + * scribo/filter/separators_in_element.hh, + * scribo/filter/separators_in_paragraph.hh, + * scribo/filter/separators_vert_in_borders.hh, + * scribo/io/img/save.hh, + * scribo/io/text_boxes/save.hh, + * scribo/io/xml/internal/save_image_to_xml.hh, + * scribo/io/xml/save.hh, + * scribo/layout/xy_cut.hh, + * scribo/make/influence_zone_graph.hh, + * scribo/make/text_blocks_image.hh, + * scribo/make/text_components_image.hh, + * scribo/postprocessing/fill_object_holes.hh, + * scribo/postprocessing/images_to_drop_capital.hh, + * scribo/preprocessing/crop.hh, + * scribo/preprocessing/crop_without_localization.hh, + * scribo/preprocessing/denoise.hh, + * scribo/preprocessing/denoise_bg.hh, + * scribo/preprocessing/denoise_fg.hh, + * scribo/preprocessing/deskew.hh, + * scribo/preprocessing/deskew_crop.hh, + * scribo/preprocessing/homogeneous_contrast.hh, + * scribo/preprocessing/rotate_90.hh, + * scribo/preprocessing/split_bg_fg.hh, + * scribo/primitive/extract/alignments.hh, + * scribo/primitive/extract/canvas.hh, + * scribo/primitive/extract/cells.hh, + * scribo/primitive/extract/components.hh, + * scribo/primitive/extract/horizontal_separators.hh, + * scribo/primitive/extract/lines_discontinued.hh, + * scribo/primitive/extract/lines_h_discontinued.hh, + * scribo/primitive/extract/lines_h_pattern.hh, + * scribo/primitive/extract/lines_h_single.hh, + * scribo/primitive/extract/lines_h_thick.hh, + * scribo/primitive/extract/lines_h_thick_and_single.hh, + * scribo/primitive/extract/lines_h_thick_and_thin.hh, + * scribo/primitive/extract/lines_pattern.hh, + * scribo/primitive/extract/lines_thick.hh, + * scribo/primitive/extract/lines_v_discontinued.hh, + * scribo/primitive/extract/lines_v_pattern.hh, + * scribo/primitive/extract/lines_v_single.hh, + * scribo/primitive/extract/lines_v_thick.hh, + * scribo/primitive/extract/lines_v_thick_and_single.hh, + * scribo/primitive/extract/non_text.hh, + * scribo/primitive/extract/non_text_hdoc.hh, + * scribo/primitive/extract/non_text_kmean.hh, + * scribo/primitive/extract/separators.hh, + * scribo/primitive/extract/separators_nonvisible.hh, + * scribo/primitive/extract/vertical_separators.hh, + * scribo/primitive/group/apply.hh, + * scribo/primitive/group/from_double_link.hh, + * scribo/primitive/group/from_double_link_any.hh, + * scribo/primitive/group/from_graph.hh, + * scribo/primitive/group/from_single_link.hh, + * scribo/primitive/identify.hh, + * scribo/primitive/internal/find_graph_link.hh, + * scribo/primitive/internal/rd.hh, + * scribo/primitive/internal/update_graph_link.hh, + * scribo/primitive/link/compute.hh, + * scribo/primitive/link/compute_several.hh, + * scribo/primitive/link/merge_double_link.hh, + * scribo/primitive/link/merge_double_link_closest_aligned.hh, + * scribo/primitive/link/with_graph.hh, + * scribo/primitive/link/with_rag.hh, + * scribo/primitive/link/with_several_graphes.hh, + * scribo/primitive/link/with_several_left_links.hh, + * scribo/primitive/link/with_several_right_closest_links.hh, + * scribo/primitive/link/with_several_right_links.hh, + * scribo/primitive/link/with_several_right_links_overlap.hh, + * scribo/primitive/link/with_single_down_link.hh, + * scribo/primitive/link/with_single_left_link.hh, + * scribo/primitive/link/with_single_left_link_dmax_ratio.hh, + * scribo/primitive/link/with_single_left_link_dmax_ratio_aligned.hh, + * scribo/primitive/link/with_single_right_link.hh, + * scribo/primitive/link/with_single_right_link_bottom.hh, + * scribo/primitive/link/with_single_right_link_dmax_ratio.hh, + * scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh, + * scribo/primitive/link/with_single_right_link_top.hh, + * scribo/primitive/link/with_single_up_link.hh, + * scribo/primitive/merge/components.hh, + * scribo/primitive/regroup/from_single_left_link.hh, + * scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh, + * scribo/primitive/remove/separators.hh, + * scribo/subsampling/bilinear.hh, + * scribo/subsampling/integral.hh, + * scribo/subsampling/integral_single_image.hh, + * scribo/table/align_lines_horizontaly.hh, + * scribo/table/align_lines_verticaly.hh, + * scribo/table/connect_horizontal_lines.hh, + * scribo/table/connect_vertical_lines.hh, + * scribo/table/erase.hh, + * scribo/table/extract.hh, + * scribo/table/internal/align_lines.hh, + * scribo/table/internal/connect_lines.hh, + * scribo/table/internal/repair_lines.hh, + * scribo/table/rebuild.hh, + * scribo/table/repair_horizontal_lines.hh, + * scribo/table/repair_vertical_lines.hh, + * scribo/text/clean.hh, + * scribo/text/clean_inplace.hh, + * scribo/text/extract_lines.hh, + * scribo/text/extract_lines_with_features.hh, + * scribo/text/extract_lines_wo_merge.hh, + * scribo/text/look_like_text_lines.hh, + * scribo/text/paragraphs_closing.hh, + * scribo/text/recognition.hh, + * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh, + * scribo/toolchain/nepomuk/text_extraction.hh, + * scribo/toolchain/text_in_doc_preprocess.hh, + * scribo/toolchain/text_in_picture.hh, + * scribo/upsampling/bs2x.hh, + * scribo/upsampling/eagle.hh, + * scribo/util/box_intersection.hh, + * scribo/util/box_is_included.hh, + * scribo/util/component_precise_outline.hh, + * scribo/util/compute_sub_domains.hh, + * scribo/util/hex_to_color.hh, + * scribo/util/init_integral_image.hh, + * src/binarization/global_threshold.cc, + * src/binarization/kim.cc, + * src/binarization/niblack.cc, + * src/binarization/otsu.cc, + * src/binarization/pgm_global_threshold_auto.cc, + * src/binarization/pgm_niblack_threshold_image.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_debug.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_debug.cc, + * src/binarization/sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_split.cc, + * src/binarization/singh.cc, + * src/binarization/wolf.cc, + * src/content_in_doc.cc, + * src/content_in_hdoc.cc, + * src/contest/DAE-2011/content_in_doc_dae.cc, + * src/contest/DAE-2011/content_in_hdoc_dae.cc, + * src/contest/hdlac-2011/content_in_hdoc_hdlac.cc, + * src/debug/highlight_text_area.cc, + * src/debug/show_info_median_inter_characters.cc, + * src/debug/show_info_x_height.cc, + * src/debug/show_lines_boldness.cc, + * src/debug/show_objects_large.cc, + * src/debug/show_objects_large_small.cc, + * src/debug/show_objects_small.cc, + * src/debug/show_objects_thick.cc, + * src/debug/show_objects_thin.cc, + * src/debug/show_paragraph_blocks.cc, + * src/debug/show_separators.cc, + * src/debug/show_stoppers.cc, + * src/debug/show_text_lines.cc, + * src/debug/show_text_lines_wo_seps.cc, + * src/filter/objects_large.cc, + * src/filter/objects_small.cc, + * src/filter/objects_thick.cc, + * src/filter/objects_thin.cc, + * src/filter/objects_with_holes.cc, + * src/filter/objects_with_holes_pgm.cc, + * src/misc/negate.cc, + * src/misc/superpose.cc, + * src/non_text_components.cc, + * src/pbm_text_in_doc.cc, + * src/postprocessing/fill_object_holes.cc, + * src/preprocessing/denoise_bg.cc, + * src/preprocessing/denoise_fg.cc, + * src/preprocessing/preprocess.cc, + * src/preprocessing/split_bg_fg.cc, + * src/preprocessing/subsample.cc, + * src/preprocessing/unskew.cc, + * src/primitive/extract/alignments.cc, + * src/primitive/extract/discontinued_hlines.cc, + * src/primitive/extract/discontinued_lines.cc, + * src/primitive/extract/discontinued_vlines.cc, + * src/primitive/extract/lines_pattern.cc, + * src/primitive/extract/separators_nonvisible.cc, + * src/primitive/extract/thick_hlines.cc, + * src/primitive/extract/thick_vlines.cc, + * src/primitive/find/find_discontinued_lines.cc, + * src/primitive/find/find_pattern_lines.cc, + * src/primitive/find/find_single_lines.cc, + * src/primitive/find/find_thick_and_single_lines.cc, + * src/primitive/find/find_thick_lines.cc, + * src/primitive/remove/separators.cc, + * src/table/erase.cc, + * src/table/extract.cc, + * src/text/cleantxt.cc, + * src/text/pbm_lines_recognition.cc, + * src/text/pbm_recognition.cc, + * src/text_in_picture.cc, + * src/text_in_picture_dual.cc, + * src/text_recognition_in_picture.cc, + * src/util/component_precise_outline.cc: Here. + 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> Remove references to InitializeMagick(). hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/trace created: olena-2.0-399-g4b98621
by git＠lrde.epita.fr 19 Mar '13

19 Mar '13

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/trace has been created at 4b986216fbc85d5f86db7b55a85a28a9d25608f2 (commit) - Log ----------------------------------------------------------------- 4b98621 Make use of mln_trace_warning in Scribo. 1995b37 Remove last references to mln::trace::*. e45787c Introduce mln_trace_warning macro. 3164abc Remove last references to mln::trace::*. e435b9b Remove deprecated trace system. d48b8a4 Make use of mln_trace. 24d3d37 Introduce mln_trace. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-396-gb6f5568 demo/xml2doc/main.cc: Kill warnings.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/main.cc | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b0455fc..0121ab4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/xml2doc/main.cc: Kill warnings. + 2013-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> Remove references to InitializeMagick(). diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index 368e52d..a42d6ab 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -199,15 +199,19 @@ int main(int argc, char **argv) XmlTransform xmlt(argv[2], argv[3], dir); xmlt.createOpen(); + // FIXME: we should check the return value of system(). + int rvalue; + (void) rvalue; + QString datarootdir = get_datarootdir("html/main.xsl"); - system(QString("xsltproc \"%1/html/main.xsl\" \"%2/output.xml\" > %2/out.html") - .arg(datarootdir).arg(dir).toAscii().constData()); + rvalue = system(QString("xsltproc \"%1/html/main.xsl\" \"%2/output.xml\" > %2/out.html") + .arg(datarootdir).arg(dir).toAscii().constData()); qDebug() << QString("Open Document output : %1").arg(argv[4]); datarootdir = get_datarootdir("bin/ooconvert"); - system(QString(" \"%1/bin/ooconvert\" \"%2/out.html\" \"%2/out.odt\" > /dev/null") - .arg(datarootdir).arg(dir).toAscii().constData()); + rvalue = system(QString(" \"%1/bin/ooconvert\" \"%2/out.html\" \"%2/out.odt\" > /dev/null") + .arg(datarootdir).arg(dir).toAscii().constData()); QString cur_dir = QDir::currentPath(); QString tmp_dir = dir + "/oo_tmp"; @@ -215,11 +219,11 @@ int main(int argc, char **argv) QDir d; d.mkdir(tmp_dir); qDebug() << "unzip %1/out.odt -d %2 > /dev/null" << dir << tmp_dir; - system(QString("unzip %1/out.odt -d %2 > /dev/null") - .arg(dir).arg(tmp_dir).toAscii().constData()); + rvalue = system(QString("unzip %1/out.odt -d %2 > /dev/null") + .arg(dir).arg(tmp_dir).toAscii().constData()); - system(QString("cat %1/content.xml | sed -re 's!\\.\\./([a-zA-Z0-9])!Pictures/\\1!g' " - ">> %1/tmp.xml").arg(tmp_dir).toAscii().constData()); + rvalue = system(QString("cat %1/content.xml | sed -re 's!\\.\\./([a-zA-Z0-9])!Pictures/\\1!g' " + ">> %1/tmp.xml").arg(tmp_dir).toAscii().constData()); d.mkdir(tmp_dir + "/Pictures"); d.rename(dir + "/*.png", tmp_dir + "/Pictures/"); @@ -227,7 +231,7 @@ int main(int argc, char **argv) d.cd(tmp_dir); qDebug() << "zip zip.odt -r * > /dev/null"; - system("zip zip.odt -r * > /dev/null"); + rvalue = system("zip zip.odt -r * > /dev/null"); QFile::copy("zip.odt", argv[4]); d.cd(cur_dir); -- 1.7.2.5

1 0

olena-2.0-395-g28448a6 tests/trait/op/plus.cc: Kill warnings.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

--- milena/ChangeLog | 4 ++++ milena/tests/trait/op/plus.cc | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bba5d19..3170851 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/trait/op/plus.cc: Kill warnings. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/magick/internal/init_magick.hh: Add a missing inline. 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/tests/trait/op/plus.cc b/milena/tests/trait/op/plus.cc index 6639a43..01c6eb3 100644 --- a/milena/tests/trait/op/plus.cc +++ b/milena/tests/trait/op/plus.cc @@ -102,12 +102,12 @@ namespace mln template <typename T, typename U> struct set_precise_binary_< op::plus, my_image2d<T>, my_image2d<U> > { - typedef mln_trait_op_plus(T, U) V; + typedef mln_trait_op_plus(T, U) V; typedef my_image2d<V>& ret; }; } - + } int main() @@ -116,11 +116,13 @@ int main() { mln_trait_op_plus_(int, float) tmp; tmp = 5.1f; + (void) tmp; } { my_image2d<float> ima; my_image2d<float>* ptr = &ima; mln_trait_op_plus_(my_image2d<int>, my_image2d<float>) tmp = *ptr; tmp.m(); + (void) tmp; } } -- 1.7.2.5

1 0

olena-2.0-394-gce98413 mln/io/magick/internal/init_magick.hh: Add a missing inline.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

--- milena/ChangeLog | 4 ++++ milena/mln/io/magick/internal/init_magick.hh | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c979c59..bba5d19 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/magick/internal/init_magick.hh: Add a missing inline. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Make fld tests write in different files. * tests/io/fld/fld1d.cc, diff --git a/milena/mln/io/magick/internal/init_magick.hh b/milena/mln/io/magick/internal/init_magick.hh index 35a64a2..a17e285 100644 --- a/milena/mln/io/magick/internal/init_magick.hh +++ b/milena/mln/io/magick/internal/init_magick.hh @@ -51,6 +51,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + inline init_magick::init_magick() { Magick::InitializeMagick(0); -- 1.7.2.5

1 0

olena-2.0-393-g3570351 Make fld tests write in different files.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

* tests/io/fld/fld1d.cc, * tests/io/fld/fld2d.cc, * tests/io/fld/fld3d.cc: Write in different files to allow those tests to be run simultaneously. --- milena/ChangeLog | 9 +++++++++ milena/tests/io/fld/fld1d.cc | 9 +++++---- milena/tests/io/fld/fld2d.cc | 21 +++++++++++---------- milena/tests/io/fld/fld3d.cc | 9 +++++---- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa4dc0d..c979c59 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Make fld tests write in different files. + + * tests/io/fld/fld1d.cc, + * tests/io/fld/fld2d.cc, + * tests/io/fld/fld3d.cc: Write in different files to allow those + tests to be run simultaneously. + +2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. 2013-03-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/tests/io/fld/fld1d.cc b/milena/tests/io/fld/fld1d.cc index 00dbf29..9792bd6 100644 --- a/milena/tests/io/fld/fld1d.cc +++ b/milena/tests/io/fld/fld1d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -47,11 +48,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out1d.fld"); + io::fld::load(test, "out1d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out1d.fld"); mln_assertion(ori == test); } diff --git a/milena/tests/io/fld/fld2d.cc b/milena/tests/io/fld/fld2d.cc index 0ab7aa7..33943dd 100644 --- a/milena/tests/io/fld/fld2d.cc +++ b/milena/tests/io/fld/fld2d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,11 +55,11 @@ int main() image2d<int_u8> ori, test; io::pgm::load(ori, MLN_IMG_DIR "/lena.pgm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -69,11 +70,11 @@ int main() image2d<int_u16> ori, test; io::ppm::load(ori, MLN_IMG_DIR "/lena_16.ppm"); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); mln_assertion(ori == test); } @@ -92,11 +93,11 @@ int main() ori(p) = random() / RAND_MAX; } - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out2d.fld"); + io::fld::load(test, "out2d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out2d.fld"); { mln_piter_(image2d<float>) p(domain); diff --git a/milena/tests/io/fld/fld3d.cc b/milena/tests/io/fld/fld3d.cc index 2813607..525241d 100644 --- a/milena/tests/io/fld/fld3d.cc +++ b/milena/tests/io/fld/fld3d.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -49,11 +50,11 @@ int main() ori.init_(b); debug::iota(ori); - io::fld::save(ori, "out.fld"); - io::fld::load(test, "out.fld"); + io::fld::save(ori, "out3d.fld"); + io::fld::load(test, "out3d.fld"); // Clean output. - std::remove("out.fld"); + std::remove("out3d.fld"); mln_assertion(ori == test); } -- 1.7.2.5

1 0

olena-2.0-399-g4b98621 Make use of mln_trace_warning in Scribo.
by Guillaume Lazzara 19 Mar '13

19 Mar '13

* scribo/canvas/integral_browsing.hh, * scribo/filter/internal/alignment_angle.hh, * scribo/io/img/save.hh, * scribo/io/xml/save.hh, * scribo/make/debug_filename.hh, * scribo/primitive/extract/alignments.hh, * scribo/primitive/link/internal/compute_anchor.hh: Here. --- scribo/ChangeLog | 12 ++++++++++++ scribo/scribo/canvas/integral_browsing.hh | 12 +++++++----- scribo/scribo/filter/internal/alignment_angle.hh | 8 ++++---- scribo/scribo/io/img/save.hh | 4 ++-- scribo/scribo/io/xml/save.hh | 3 ++- scribo/scribo/make/debug_filename.hh | 2 +- scribo/scribo/primitive/extract/alignments.hh | 7 ++++--- .../primitive/link/internal/compute_anchor.hh | 4 ++-- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 47b0cad..e0d0731 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Make use of mln_trace_warning in Scribo. + + * scribo/canvas/integral_browsing.hh, + * scribo/filter/internal/alignment_angle.hh, + * scribo/io/img/save.hh, + * scribo/io/xml/save.hh, + * scribo/make/debug_filename.hh, + * scribo/primitive/extract/alignments.hh, + * scribo/primitive/link/internal/compute_anchor.hh: Here. + +2013-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove last references to mln::trace::*. * demo/xml2doc/main.cc, diff --git a/scribo/scribo/canvas/integral_browsing.hh b/scribo/scribo/canvas/integral_browsing.hh index 51cbdf6..c554eaf 100644 --- a/scribo/scribo/canvas/integral_browsing.hh +++ b/scribo/scribo/canvas/integral_browsing.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -94,16 +94,18 @@ namespace scribo w = std::min(ima.domain().ncols(), ima.domain().nrows()) - ima.border(); if (! (w % 2)) --w; - trace::warning("integral_browsing - Adjusting window width since it" - " was larger than image height."); + mln_trace_warning("integral_browsing - " + "Adjusting window width since it" + " was larger than image height."); } if (h > (ima.domain().nrows() - ima.border())) { h = std::min(ima.domain().ncols(), ima.domain().nrows()) - ima.border(); if (! (h % 2)) --h; - trace::warning("integral_browsing - Adjusting window height since it" - " was larger than image width."); + mln_trace_warning("integral_browsing - " + "Adjusting window height since it" + " was larger than image width."); } diff --git a/scribo/scribo/filter/internal/alignment_angle.hh b/scribo/scribo/filter/internal/alignment_angle.hh index fcbb892..9b0acd5 100644 --- a/scribo/scribo/filter/internal/alignment_angle.hh +++ b/scribo/scribo/filter/internal/alignment_angle.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -161,8 +161,8 @@ namespace scribo break; default: - trace::warning("scribo::filter::internal::alignment_angle," - " Invalid anchor value... Aborting computation."); + mln_trace_warning("scribo::filter::internal::alignment_angle," + " Invalid anchor value... Aborting computation."); } return result; diff --git a/scribo/scribo/io/img/save.hh b/scribo/scribo/io/img/save.hh index 07638ea..5b3da6a 100644 --- a/scribo/scribo/io/img/save.hh +++ b/scribo/scribo/io/img/save.hh @@ -237,8 +237,8 @@ namespace scribo break; default: - trace::warning("scribo::io::img::save - " - "Invalid image format! Skip saving..."); + mln_trace_warning("scribo::io::img::save - " + "Invalid image format! Skip saving..."); return; } diff --git a/scribo/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh index cfd0a31..29b722f 100644 --- a/scribo/scribo/io/xml/save.hh +++ b/scribo/scribo/io/xml/save.hh @@ -159,7 +159,8 @@ namespace scribo # endif // ! HAVE_QT default: - trace::warning("scribo::io::xml::save - Invalid XML format! Skip saving..."); + mln_trace_warning("scribo::io::xml::save - " + "Invalid XML format! Skip saving..."); } output.close(); diff --git a/scribo/scribo/make/debug_filename.hh b/scribo/scribo/make/debug_filename.hh index f7d9b67..95e60b5 100644 --- a/scribo/scribo/make/debug_filename.hh +++ b/scribo/scribo/make/debug_filename.hh @@ -82,7 +82,7 @@ namespace scribo if (! internal::debug_filename_prefix.empty()) os << internal::debug_filename_prefix << "_"; else - mln::trace::warning("You may like to set a default filename prefix."); + mln_trace_warning("You may like to set a default filename prefix."); if (file_id < 10) os << "0"; diff --git a/scribo/scribo/primitive/extract/alignments.hh b/scribo/scribo/primitive/extract/alignments.hh index 4d8c9ad..27e2ad6 100644 --- a/scribo/scribo/primitive/extract/alignments.hh +++ b/scribo/scribo/primitive/extract/alignments.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. // @@ -319,7 +320,7 @@ namespace scribo } default: - trace::warning("anchor not handled!"); + mln_trace_warning("anchor not handled!"); } return false; @@ -422,7 +423,7 @@ namespace scribo } default: - trace::warning("anchor not handled!"); + mln_trace_warning("anchor not handled!"); } return false; diff --git a/scribo/scribo/primitive/link/internal/compute_anchor.hh b/scribo/scribo/primitive/link/internal/compute_anchor.hh index 9afc33f..c7c9592 100644 --- a/scribo/scribo/primitive/link/internal/compute_anchor.hh +++ b/scribo/scribo/primitive/link/internal/compute_anchor.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -258,7 +258,7 @@ namespace scribo default: - trace::warning("Non handled anchor"); + mln_trace_warning("Non handled anchor"); mln_assertion(anchor < anchor::Invalid); } -- 1.7.2.5

1 0