- Olena-patches

branch next updated: last-svn-commit-180-g7671c7d
by git＠lrde.epita.fr 27 Jul '10

27 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 7671c7df2acc25243c83131813db612be8a654b2 (commit) via 15a057175710227bdea5a9702dcbf5bd64704a9d (commit) from 71c9c144f233770f1b9652ba98d6137053e8ab47 (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 ----------------------------------------------------------------- 7671c7d Fix milena/sandbox/ChangeLog. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 28 ++++++ milena/mln/io/magick/load.hh | 184 ++++++++++++++++++++---------------- milena/mln/io/magick/save.hh | 140 +++++++++++++++++----------- milena/sandbox/ChangeLog | 44 +++++----- milena/tests/io/magick/Makefile.am | 8 +- milena/tests/io/magick/load.cc | 72 ++++++++++++-- milena/tests/io/magick/save.cc | 86 ++++++++++++++--- 7 files changed, 376 insertions(+), 186 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch exp/scribo-arthur updated: last-svn-commit-244-gc2c13c5
by git＠lrde.epita.fr 23 Jul '10

23 Jul '10

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/scribo-arthur has been updated via c2c13c5068e8d7604ee28ccd534739180bed9e9b (commit) from e0017b7c2dc690ef5bb3ed5c050b3b07e9b08005 (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 ----------------------------------------------------------------- c2c13c5 OpenDocument output (odt and odf). ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/ChangeLog | 15 ++++++++++++ scribo/sandbox/arthur/xml_transform/README | 9 ++++++- scribo/sandbox/arthur/xml_transform/loader.cc | 12 ++++++++++ scribo/sandbox/arthur/xml_transform/loader.hh | 1 + scribo/sandbox/arthur/xml_transform/main.cc | 18 ++++++++++++-- .../templates/{html => opendoc}/css.css | 1 - .../templates/opendoc/opendoc_generator.sh | 24 ++++++++++++++++++++ .../templates/{html => opendoc}/xsl.xsl | 6 +---- .../sandbox/arthur/xml_transform/xml_transform.cc | 19 +++++++++++++++ .../sandbox/arthur/xml_transform/xml_transform.hh | 1 + 10 files changed, 96 insertions(+), 10 deletions(-) copy scribo/sandbox/arthur/xml_transform/templates/{html => opendoc}/css.css (93%) mode change 100644 => 100755 create mode 100755 scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh copy scribo/sandbox/arthur/xml_transform/templates/{html => opendoc}/xsl.xsl (95%) mode change 100644 => 100755 hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-244-gc2c13c5 OpenDocument output (odt and odf).
by Arthur Crepin-Leblond 23 Jul '10

23 Jul '10

* arthur/xml_transform/templates/opendoc/css.css, * arthur/xml_transform/templates/opendoc/opendoc_generator.sh, * arthur/xml_transform/templates/opendoc/xsl.xsl: New. * arthur/xml_transform/README * arthur/xml_transform/loader.cc * arthur/xml_transform/loader.hh * arthur/xml_transform/main.cc * arthur/xml_transform/xml_transform.cc * arthur/xml_transform/xml_transform.hh --- scribo/sandbox/ChangeLog | 15 ++++++++++++ scribo/sandbox/arthur/xml_transform/README | 9 ++++++- scribo/sandbox/arthur/xml_transform/loader.cc | 12 ++++++++++ scribo/sandbox/arthur/xml_transform/loader.hh | 1 + scribo/sandbox/arthur/xml_transform/main.cc | 18 ++++++++++++-- .../templates/{html => opendoc}/css.css | 1 - .../templates/opendoc/opendoc_generator.sh | 24 ++++++++++++++++++++ .../templates/{html => opendoc}/xsl.xsl | 6 +---- .../sandbox/arthur/xml_transform/xml_transform.cc | 19 +++++++++++++++ .../sandbox/arthur/xml_transform/xml_transform.hh | 1 + 10 files changed, 96 insertions(+), 10 deletions(-) copy scribo/sandbox/arthur/xml_transform/templates/{html => opendoc}/css.css (93%) mode change 100644 => 100755 create mode 100755 scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh copy scribo/sandbox/arthur/xml_transform/templates/{html => opendoc}/xsl.xsl (95%) mode change 100644 => 100755 diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 7c53037..176e809 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,18 @@ +2010-07-23 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + OpenDocument output (odt and odf). + + * arthur/xml_transform/templates/opendoc/css.css, + * arthur/xml_transform/templates/opendoc/opendoc_generator.sh, + * arthur/xml_transform/templates/opendoc/xsl.xsl: New. + + * arthur/xml_transform/README + * arthur/xml_transform/loader.cc + * arthur/xml_transform/loader.hh + * arthur/xml_transform/main.cc + * arthur/xml_transform/xml_transform.cc + * arthur/xml_transform/xml_transform.hh + 2010-07-22 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> SVG output. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 4e98a76..9ac4973 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -16,14 +16,21 @@ SVG output: Base 64 operations: --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. + +OpenDocument output: + --open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf). + +Base 64 operations: + --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. --to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64. --from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files. -For PDF/HTML/SVG output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh +For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh Requirements: PDF : fop >= 0.95 HTML : xsltproc SVG : trunk version of fop +OpenDocument : ooconvert BUILD: diff --git a/scribo/sandbox/arthur/xml_transform/loader.cc b/scribo/sandbox/arthur/xml_transform/loader.cc index 1698899..d4778a9 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.cc +++ b/scribo/sandbox/arthur/xml_transform/loader.cc @@ -141,6 +141,18 @@ void Loader::add_svg_templates(QString output) xsl.copy(output + "main.xsl"); } +void Loader::add_open_templates(QString output) +{ + QFile css("templates/opendoc/css.css"); + css.copy(output + "css.css"); + + QFile gen("templates/opendoc/opendoc_generator.sh"); + gen.copy(output + "opendoc_generator.sh"); + + QFile xsl("templates/opendoc/xsl.xsl"); + xsl.copy(output + "xsl.xsl"); +} + bool Loader::xml_output(QString xml_file, bool html, QString output) { QFile file(xml_file); diff --git a/scribo/sandbox/arthur/xml_transform/loader.hh b/scribo/sandbox/arthur/xml_transform/loader.hh index 3cbae5c..a5c3637 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.hh +++ b/scribo/sandbox/arthur/xml_transform/loader.hh @@ -43,6 +43,7 @@ class Loader : public QObject bool set_output(QString& output); void add_pdf_templates(bool crop, bool base64, QString output); void add_svg_templates(QString output); + void add_open_templates(QString output); void add_html_templates(bool base64, QString output); }; diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index d1c789d..34a1b6e 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -19,18 +19,25 @@ int main(int argc, char **argv) "SVG output:\n" "\t--svg <xml> <out_dir> : SVG output (works only with base 64 xml encoded.\n\n" "Base 64 operations:\n" + "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n\n" + + "OpenDocument output:\n" + "\t--open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf).\n\n" + "Base 64 operations:\n" "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n" "\t--to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64.\n" "\t--from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files.\n\n" - "For PDF/HTML/SVG output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" + "For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" "Requirements:\n" "PDF : fop >= 0.95\n" "HTML : xsltproc\n" - "SVG : trunk version of fop\n"; + "SVG : trunk version of fop\n" + "OpenDocument : ooconvert"; if (argc > 4) { std::string html = "--html"; + std::string open = "--open"; std::string pdf = "--pdf"; std::string pdf_no_crop = "--pdf-no-crop"; std::string to_base64 = "--to-base64"; @@ -41,11 +48,16 @@ int main(int argc, char **argv) XmlTransform xmlt(argv[2], argv[3], argv[4]); xmlt.createHTML(false); } - if (pdf.compare(argv[1]) == 0) + else if (pdf.compare(argv[1]) == 0) { XmlTransform xmlt(argv[2], argv[3], argv[4]); xmlt.createPDF(true, false); } + else if (open.compare(argv[1]) == 0) + { + XmlTransform xmlt(argv[2], argv[3], argv[4]); + xmlt.createOpen(); + } else if (pdf_no_crop.compare(argv[1]) == 0) { XmlTransform xmlt(argv[2], argv[3], argv[4]); diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/css.css b/scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css old mode 100644 new mode 100755 similarity index 93% copy from scribo/sandbox/arthur/xml_transform/templates/html/css.css copy to scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css index 0443390..1559149 --- a/scribo/sandbox/arthur/xml_transform/templates/html/css.css +++ b/scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css @@ -1,7 +1,6 @@ .line { position:absolute; - background-color:white; z-index:7; display:inline; white-space:pre; diff --git a/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh b/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh new file mode 100755 index 0000000..c2d9e6f --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +if [ -z "$1" ] +then + echo "opendoc_generator <odt|odf>"; +else + if [ "$1" == "odt" ] + then + echo "saving to output.odt"; + xsltproc xsl.xsl output.xml > output.html + ooconvert output.html output.odt + rm output.html + elif [ "$1" == "odf" ] + then + echo "saving to output.odf"; + xsltproc xsl.xsl output.xml > output.html + ooconvert output.html output.odf; + rm output.html + else + echo "opendoc_generator <odt|odf>"; + fi +fi + +#rm output.html \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl b/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl old mode 100644 new mode 100755 similarity index 95% copy from scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl copy to scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl index 1f29044..bf1cc30 --- a/scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl +++ b/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl @@ -15,8 +15,6 @@ pcGts/page/chart_region| pcGts/page/table_region| pcGts/page/separator_region| - pcGts/page/text_region| - pcGts/page/text_region/paragraph| pcGts/page/text_region/paragraph/line">  @@ -129,10 +127,8 @@ </xsl:choose> </xsl:variable> - <div class="line" onmouseover="this.style.opacity=0.2;this.filters.alpha.opacity=20" - onmouseout="this.style.opacity=1;this.filters.alpha.opacity=100"> + <div class="line"> <xsl:attribute name="style"> - opacity:1; height:auto; font-size:<xsl:value-of select="$a+$d" />px; width:<xsl:value-of select="$x2 - $x1" />px; diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.cc b/scribo/sandbox/arthur/xml_transform/xml_transform.cc index c40366a..90af5a5 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.cc +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.cc @@ -117,6 +117,25 @@ void XmlTransform::createPDF (bool crop, bool base64) abort(); } +void XmlTransform::createOpen () +{ + if (loader_->xml_output(xml_file_, false, output_dir_)) + { + QString output = output_dir_; + output.append("img"); + + if (loader_->set_output(output)) + { + crop_->crop_regions(); + loader_->add_open_templates(output_dir_); + } + else + abort(); + } + else + abort(); +} + void XmlTransform::createSVG () { if (loader_->xml_output(xml_file_, false, output_dir_)) diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.hh b/scribo/sandbox/arthur/xml_transform/xml_transform.hh index 30d5c6c..ad83fd5 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.hh +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.hh @@ -43,6 +43,7 @@ class XmlTransform : public QObject void createHTML(bool base64); void createPDF(bool crop, bool base64); void createSVG(); + void createOpen(); void toBase64(bool crop); void fromBase64(); -- 1.5.6.5

1 0

branch exp/scribo-arthur updated: last-svn-commit-243-ge0017b7
by git＠lrde.epita.fr 22 Jul '10

22 Jul '10

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/scribo-arthur has been updated via e0017b7c2dc690ef5bb3ed5c050b3b07e9b08005 (commit) from 61e1870fd06af56ae92ef1cf37b408f443541d9f (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 ----------------------------------------------------------------- e0017b7 SVG output. ----------------------------------------------------------------------- Summary of changes: scribo/sandbox/ChangeLog | 15 +++ scribo/sandbox/arthur/xml_transform/README | 25 ++++-- scribo/sandbox/arthur/xml_transform/loader.cc | 15 +++ scribo/sandbox/arthur/xml_transform/loader.hh | 1 + scribo/sandbox/arthur/xml_transform/main.cc | 41 ++++++--- .../xml_transform/templates/pdf/regions_svg.xsl | 98 ++++++++++++++++++++ .../xml_transform/templates/pdf/svg_generator.sh | 3 + .../sandbox/arthur/xml_transform/xml_transform.cc | 10 ++ .../sandbox/arthur/xml_transform/xml_transform.hh | 1 + 9 files changed, 188 insertions(+), 21 deletions(-) create mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl create mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-243-ge0017b7 SVG output.
by Arthur Crepin-Leblond 22 Jul '10

22 Jul '10

* arthur/xml_transform/README * arthur/xml_transform/loader.cc * arthur/xml_transform/loader.hh * arthur/xml_transform/main.cc * arthur/xml_transform/xml_transform.cc * arthur/xml_transform/xml_transform.hh * arthur/xml_transform/templates/pdf/regions_svg.xsl, * arthur/xml_transform/templates/pdf/svg_generator.sh: New. --- scribo/sandbox/ChangeLog | 15 +++ scribo/sandbox/arthur/xml_transform/README | 25 ++++-- scribo/sandbox/arthur/xml_transform/loader.cc | 15 +++ scribo/sandbox/arthur/xml_transform/loader.hh | 1 + scribo/sandbox/arthur/xml_transform/main.cc | 41 ++++++--- .../xml_transform/templates/pdf/regions_svg.xsl | 98 ++++++++++++++++++++ .../xml_transform/templates/pdf/svg_generator.sh | 3 + .../sandbox/arthur/xml_transform/xml_transform.cc | 10 ++ .../sandbox/arthur/xml_transform/xml_transform.hh | 1 + 9 files changed, 188 insertions(+), 21 deletions(-) create mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl create mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 8d7b3e9..7c53037 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,18 @@ +2010-07-22 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + SVG output. + + * arthur/xml_transform/README + * arthur/xml_transform/loader.cc + * arthur/xml_transform/loader.hh + * arthur/xml_transform/main.cc + * arthur/xml_transform/xml_transform.cc + * arthur/xml_transform/xml_transform.hh + + * arthur/xml_transform/templates/pdf/regions_svg.xsl, + * arthur/xml_transform/templates/pdf/svg_generator.sh: New. + + 2010-07-15 Arthur Crepin-Leblond <crepin(a)stockholm.lrde.epita.fr> XML Tranform. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index aedf220..4e98a76 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -1,23 +1,29 @@ xml_transform - OPTIONS: HTML output: - --html <xml> <ppm> <out_dir> : HTML output with non-text regions croped into many png files. + --html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files. --html-base64 <xml> <out_dir> : HTML output from a container XML file. PDF output: - --pdf <xml> <ppm> <out_dir> : PDF output with non-text regions croped into many png files. + --pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files. --pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text. --pdf-base64 <xml> <out_dir> : PDF output from a container XML file. - --pdf-base64-no-crop <xml> <ppm> <out_dir> : PDF with the entire picture displayed over the text, - the picture is loaded from a container XML file. + --pdf-base64-no-crop <xml> <ppm> <out_dir> : PDF with the entire picture displayed over the text, the picture is loaded from a container XML file. + +SVG output: + --svg <xml> <out_dir> : SVG output (works only with base 64 xml encoded. Base 64 operations: - --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting croped pictures into base 64 format. + --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. --to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64. --from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files. +For PDF/HTML/SVG output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh +Requirements: +PDF : fop >= 0.95 +HTML : xsltproc +SVG : trunk version of fop BUILD: @@ -25,5 +31,10 @@ Chnage the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then mkdir _build cd _build +cp -r ../templates . qmake ../xml_transfrom.pro -make \ No newline at end of file +make + +/!\ IMPORTANT NOTE /!\ + +xml_transfrom uses a templates directory, binary and this folder should be in the same place. \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/loader.cc b/scribo/sandbox/arthur/xml_transform/loader.cc index 2b64337..1698899 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.cc +++ b/scribo/sandbox/arthur/xml_transform/loader.cc @@ -126,6 +126,21 @@ void Loader::add_pdf_templates(bool crop, bool base64, QString output) } } +void Loader::add_svg_templates(QString output) +{ + QFile regions("templates/pdf/regions_svg.xsl"); + regions.copy(output + "regions.xsl"); + + QFile gen("templates/pdf/svg_generator.sh"); + gen.copy(output + "svg_generator.sh"); + + QFile line("templates/pdf/line.xsl"); + line.copy(output + "line.xsl"); + + QFile xsl("templates/pdf/main_crop.xsl"); + xsl.copy(output + "main.xsl"); +} + bool Loader::xml_output(QString xml_file, bool html, QString output) { QFile file(xml_file); diff --git a/scribo/sandbox/arthur/xml_transform/loader.hh b/scribo/sandbox/arthur/xml_transform/loader.hh index fadceed..3cbae5c 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.hh +++ b/scribo/sandbox/arthur/xml_transform/loader.hh @@ -42,6 +42,7 @@ class Loader : public QObject QDomDocument* xml_to_dom(QString xml_file); bool set_output(QString& output); void add_pdf_templates(bool crop, bool base64, QString output); + void add_svg_templates(QString output); void add_html_templates(bool base64, QString output); }; diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index c259c76..d1c789d 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -6,20 +6,27 @@ int main(int argc, char **argv) { std::string man; - man = "xml_transform\n"; - man += "OPTIONS:\n\n"; - man += "HTML output:\n"; - man += "\t--html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files.\n"; - man += "\t--html-base64 <xml> <out_dir> : HTML output from a container XML file.\n\n"; - man += "PDF output:\n"; - man += "\t--pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files.\n"; - man += "\t--pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text.\n"; - man += "\t--pdf-base64 <xml> <out_dir> : PDF output from a container XML file.\n"; - man += "\t--pdf-base64-no-crop <xml> <ppm> <out_dir> : PDF with the entire picture displayed over the text, the picture is loaded from a container XML file.\n\n"; - man += "Base 64 operations:\n"; - man += "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n"; - man += "\t--to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64.\n"; - man += "\t--from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files.\n"; + man = "xml_transform\n" + "OPTIONS:\n\n" + "HTML output:\n" + "\t--html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files.\n" + "\t--html-base64 <xml> <out_dir> : HTML output from a container XML file.\n\n" + "PDF output:\n" + "\t--pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files.\n" + "\t--pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text.\n" + "\t--pdf-base64 <xml> <out_dir> : PDF output from a container XML file.\n" + "\t--pdf-base64-no-crop <xml> <ppm> <out_dir> : PDF with the entire picture displayed over the text, the picture is loaded from a container XML file.\n\n" + "SVG output:\n" + "\t--svg <xml> <out_dir> : SVG output (works only with base 64 xml encoded.\n\n" + "Base 64 operations:\n" + "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n" + "\t--to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64.\n" + "\t--from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files.\n\n" + "For PDF/HTML/SVG output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" + "Requirements:\n" + "PDF : fop >= 0.95\n" + "HTML : xsltproc\n" + "SVG : trunk version of fop\n"; if (argc > 4) { @@ -60,6 +67,7 @@ int main(int argc, char **argv) else if (argc > 3) { std::string pdfbase64 = "--pdf-base64"; + std::string svg = "--svg"; std::string pdfbase64nocrop = "--pdf-base64-no-crop"; std::string htmlbase64 = "--html-base64"; std::string from_base64 = "--from-base64"; @@ -69,6 +77,11 @@ int main(int argc, char **argv) XmlTransform xmlt(argv[2], QString::Null(), argv[3]); xmlt.createPDF(true, true); } + else if (svg.compare(argv[1]) == 0) + { + XmlTransform xmlt(argv[2], QString::Null(), argv[3]); + xmlt.createSVG(); + } else if (pdfbase64nocrop.compare(argv[1]) == 0) { XmlTransform xmlt(argv[2], QString::Null(), argv[3]); diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl b/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl new file mode 100644 index 0000000..86b5f51 --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl @@ -0,0 +1,98 @@ +<?xml version="1.0"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0"> + +  + + <xsl:template match="pcGts/page/image_region| + pcGts/page/graphic_region| + pcGts/page/chart_region| + pcGts/page/table_region| + pcGts/page/separator_region"> + +  + <xsl:variable name="data"> + <xsl:value-of select="container/data" /> + </xsl:variable> + +  + <xsl:variable name="y1"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@y" order="ascending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@y" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="x1"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@x" order="ascending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@x" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="y2"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@y" order="descending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@y" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="x2"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@x" order="descending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@x" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> +  + + <fo:block-container> + + <fo:block> + <fo:instream-foreign-object> + <svg:svg xmlns:svg="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + Version="1.1"> + + <xsl:attribute name="viewBox"> + <xsl:value-of select="$x1" /> <xsl:value-of select="$y1" /> <xsl:value-of select="$x2" /> <xsl:value-of select="$y2" /> + </xsl:attribute> + + <svg:image position="absolute"> + + <xsl:attribute name="y"> + <xsl:value-of select="$y1" /> + </xsl:attribute> + + <xsl:attribute name="x"> + <xsl:value-of select="$x1" /> + </xsl:attribute> + + <xsl:attribute name="width"> + <xsl:value-of select="$x2 - $x1" /> + </xsl:attribute> + + <xsl:attribute name="height"> + <xsl:value-of select="$y2 - $y1" /> + </xsl:attribute> + + <xsl:attribute name="xlink:href">data:image/png;base64,<xsl:value-of select="$data" /></xsl:attribute> + </svg:image> + + </svg:svg> + + </fo:instream-foreign-object> + + </fo:block> + </fo:block-container> + + </xsl:template> + +</xsl:stylesheet> diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh b/scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh new file mode 100644 index 0000000..0d4907c --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +fop -xsl main.xsl -xml output.xml -svg output.svg \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.cc b/scribo/sandbox/arthur/xml_transform/xml_transform.cc index ebfbed8..c40366a 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.cc +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.cc @@ -117,6 +117,16 @@ void XmlTransform::createPDF (bool crop, bool base64) abort(); } +void XmlTransform::createSVG () +{ + if (loader_->xml_output(xml_file_, false, output_dir_)) + { + loader_->add_svg_templates(output_dir_); + } + else + abort(); +} + void XmlTransform::createHTML(bool base64) { if (loader_->xml_output(xml_file_, true, output_dir_)) diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.hh b/scribo/sandbox/arthur/xml_transform/xml_transform.hh index 172bddb..30d5c6c 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.hh +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.hh @@ -42,6 +42,7 @@ class XmlTransform : public QObject void createHTML(bool base64); void createPDF(bool crop, bool base64); + void createSVG(); void toBase64(bool crop); void fromBase64(); -- 1.5.6.5

1 0

branch exp/next-build-ok updated: last-svn-commit-426-g6cdc421
by git＠lrde.epita.fr 21 Jul '10

21 Jul '10

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/next-build-ok has been updated via 6cdc4212ea8835dd20bc4a024ecd5e55a54601b1 (commit) from 92f82bb5052ce1fa559059508245769fe198c6e4 (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 ----------------------------------------------------------------- 6cdc421 Have Tesseract-related parts of Scribo compile again. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 11 +++++++++++ scribo/debug/bboxes_enlarged_image.hh | 2 +- scribo/debug/looks_like_a_text_line_image.hh | 2 +- scribo/debug/mean_and_base_lines_image.hh | 2 +- scribo/debug/save_bboxes_image.hh | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-426-g6cdc421 Have Tesseract-related parts of Scribo compile again.
by Roland Levillain 21 Jul '10

21 Jul '10

* scribo/debug/bboxes_enlarged_image.hh, * scribo/debug/looks_like_a_text_line_image.hh, * scribo/debug/mean_and_base_lines_image.hh, * scribo/debug/save_bboxes_image.hh: Catch up with scribo::line_info<L>'s current interface. Reported by Olivier Grisel <ogrisel(a)nuxeo.com>. --- scribo/ChangeLog | 11 +++++++++++ scribo/debug/bboxes_enlarged_image.hh | 2 +- scribo/debug/looks_like_a_text_line_image.hh | 2 +- scribo/debug/mean_and_base_lines_image.hh | 2 +- scribo/debug/save_bboxes_image.hh | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f82b55a..cf38883 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + Have Tesseract-related parts of Scribo compile again. + + * scribo/debug/bboxes_enlarged_image.hh, + * scribo/debug/looks_like_a_text_line_image.hh, + * scribo/debug/mean_and_base_lines_image.hh, + * scribo/debug/save_bboxes_image.hh: + Catch up with scribo::line_info<L>'s current interface. + Reported by Olivier Grisel <ogrisel(a)nuxeo.com>. + +2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + Regen SCRIBO's Makefile helpers. * scribo/headers.mk, scribo/tests/unit_test/unit-tests.mk: Here. diff --git a/scribo/debug/bboxes_enlarged_image.hh b/scribo/debug/bboxes_enlarged_image.hh index edd6d7a..2563a1a 100644 --- a/scribo/debug/bboxes_enlarged_image.hh +++ b/scribo/debug/bboxes_enlarged_image.hh @@ -104,7 +104,7 @@ namespace scribo image2d<value::rgb8> output = data::convert(value::rgb8(), input); for_all_lines(l, lines) - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) { if (text::internal::looks_like_a_text_line(lines(l))) mln::draw::box(output, lines(l).ebbox(), text_value); diff --git a/scribo/debug/looks_like_a_text_line_image.hh b/scribo/debug/looks_like_a_text_line_image.hh index a40c7d6..d8aacf0 100644 --- a/scribo/debug/looks_like_a_text_line_image.hh +++ b/scribo/debug/looks_like_a_text_line_image.hh @@ -98,7 +98,7 @@ namespace scribo image2d<value::rgb8> output = data::convert(value::rgb8(), input); for_all_lines(l, lines) - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) { if (text::internal::looks_like_a_text_line(lines(l))) mln::draw::box(output, lines(l).bbox(), text_value); diff --git a/scribo/debug/mean_and_base_lines_image.hh b/scribo/debug/mean_and_base_lines_image.hh index c4517c7..16a9aad 100644 --- a/scribo/debug/mean_and_base_lines_image.hh +++ b/scribo/debug/mean_and_base_lines_image.hh @@ -100,7 +100,7 @@ namespace scribo for_all_lines(l, lines) { - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) { mln::draw::box(output, lines(l).bbox(), bbox_value); diff --git a/scribo/debug/save_bboxes_image.hh b/scribo/debug/save_bboxes_image.hh index ee479cc..f406e08 100644 --- a/scribo/debug/save_bboxes_image.hh +++ b/scribo/debug/save_bboxes_image.hh @@ -113,7 +113,7 @@ namespace scribo output = data::convert(value::rgb8(), input); for_all_lines(l, lines) - if (! lines(l).hidden()) + if (! lines(l).is_hidden()) mln::draw::box(output, lines(l).bbox(), value); mln::io::ppm::save(output, filename); -- 1.5.6.5

1 0

branch exp/next-build-ok created: last-svn-commit-425-g92f82bb
by git＠lrde.epita.fr 21 Jul '10

21 Jul '10

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/next-build-ok has been created at 92f82bb5052ce1fa559059508245769fe198c6e4 (commit) - Log ----------------------------------------------------------------- 92f82bb Regen SCRIBO's Makefile helpers. 999dc98 scribo/text/merging.hh: Fix the path of an #include directive. d791a85 Catch up with the current interface of scribo::debug::usage. 74dd34a Disable programs still using object_image instead of component_set. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-425-g92f82bb Regen SCRIBO's Makefile helpers.
by Roland Levillain 21 Jul '10

21 Jul '10

* scribo/headers.mk, scribo/tests/unit_test/unit-tests.mk: Here. --- scribo/ChangeLog | 6 + scribo/headers.mk | 187 ++++++++++++++++++++++++++++++--- scribo/tests/unit_test/unit-tests.mk | 48 +-------- 3 files changed, 180 insertions(+), 61 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index da9d095..f82b55a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + Regen SCRIBO's Makefile helpers. + + * scribo/headers.mk, scribo/tests/unit_test/unit-tests.mk: Here. + +2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + * scribo/text/merging.hh: Fix the path of an #include directive. 2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/scribo/headers.mk b/scribo/headers.mk index 4127a31..44b261f 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -2,23 +2,46 @@ scribodir = $(includedir)/scribo nobase_scribo_HEADERS = \ ./all.hh \ -./binarization/binarize.hh \ +./binarization/global_threshold.hh \ +./binarization/global_threshold_auto.hh \ +./binarization/internal/first_pass_functor.hh \ +./binarization/local_threshold.hh \ ./binarization/sauvola.hh \ -./binarization/sauvola_threshold.hh \ -./binarization/simple.hh \ +./binarization/sauvola_ms.hh \ +./binarization/sauvola_ms_split.hh \ +./binarization/sauvola_threshold_image.hh \ +./binarization/sauvola_threshold_image_debug.hh \ +./canvas/integral_browsing.hh \ +./convert/from_qimage.hh \ ./core/all.hh \ ./core/central_sites.hh \ +./core/component_info.hh \ +./core/component_set.hh \ +./core/concept/dmax_functor.hh \ ./core/concept/link_functor.hh \ +./core/def/lbl_type.hh \ ./core/erase_objects.hh \ +./core/init_integral_image.hh \ ./core/internal/link_functor_base.hh \ +./core/line_info.hh \ +./core/line_set.hh \ ./core/macros.hh \ ./core/object_groups.hh \ ./core/object_image.hh \ ./core/object_links.hh \ +./core/tag/anchor.hh \ +./core/tag/component.hh \ +./core/tag/line.hh \ ./debug/alignment_decision_image.hh \ ./debug/all.hh \ +./debug/bboxes_enlarged_image.hh \ +./debug/char_space_image.hh \ ./debug/decision_image.hh \ +./debug/highlight_text_area.hh \ +./debug/line_info_image.hh \ ./debug/links_decision_image.hh \ +./debug/looks_like_a_text_line_image.hh \ +./debug/mean_and_base_lines_image.hh \ ./debug/save_bboxes_image.hh \ ./debug/save_label_image.hh \ ./debug/save_linked_bboxes_image.hh \ @@ -26,27 +49,86 @@ nobase_scribo_HEADERS = \ ./debug/save_table_image.hh \ ./debug/several_links_decision_image.hh \ ./debug/usage.hh \ -./demo/src/mainwindow.hh \ +./demo/demat/src/doc_type.hh \ +./demo/demat/src/main_window.hh \ +./demo/demat/src/preprocessing_task.hh \ +./demo/demat/src/process_args.hh \ +./demo/demat/src/runner.hh \ +./demo/review/src/mainwindow.hh \ +./demo/shared/src/bak/crop_item.hh \ +./demo/shared/src/bak/image_viewer.hh \ +./demo/shared/src/bak/types.hh \ +./demo/shared/src/browse_widget.hh \ +./demo/shared/src/crop_item.hh \ +./demo/shared/src/image_viewer.hh \ +./demo/shared/src/image_viewer.hxx \ +./demo/shared/src/internal.bak/interactive_scene.hh \ +./demo/shared/src/internal.bak/selection_rectangle.hh \ +./demo/shared/src/internal/interactive_scene.hh \ +./demo/shared/src/internal/selection_rectangle.hh \ +./demo/shared/src/to_mln_image.hh \ +./demo/shared/src/types.hh \ +./demo/shared/ui/interactive_scene.hh \ +./demo/tip/src/custom_delegate.hh \ +./demo/tip/src/launch_dialog.hh \ +./demo/tip/src/main_window.hh \ +./demo/viewer/browser_widget.hh \ +./demo/viewer/common.hh \ +./demo/viewer/domitem.hh \ +./demo/viewer/dommodel.hh \ +./demo/viewer/help_dialog.hh \ +./demo/viewer/image_region.hh \ +./demo/viewer/image_region.hxx \ +./demo/viewer/image_scene.hh \ +./demo/viewer/image_view.hh \ +./demo/viewer/image_widget.hh \ +./demo/viewer/key_widget.hh \ +./demo/viewer/property_widget.hh \ +./demo/viewer/step_widget.hh \ +./demo/viewer/viewer.hh \ +./demo/viewer/viewer.hxx \ +./demo/viewer/xml_widget.hh \ +./demo/wizard/src/crop_page.hh \ +./demo/wizard/src/crop_widget.hh \ +./demo/wizard/src/doc_type.hh \ +./demo/wizard/src/doc_type_page.hh \ +./demo/wizard/src/doc_type_widget.hh \ +./demo/wizard/src/load_page.hh \ +./demo/wizard/src/load_widget.hh \ +./demo/wizard/src/main_window.hh \ +./demo/wizard/src/preprocessing_page.hh \ +./demo/wizard/src/preprocessing_task.hh \ +./demo/wizard/src/preprocessing_widget.hh \ +./demo/wizard/src/process_page.hh \ +./demo/wizard/src/process_widget.hh \ +./demo/wizard/src/result_page.hh \ +./demo/wizard/src/result_widget.hh \ +./demo/wizard/src/rotate_page.hh \ +./demo/wizard/src/rotate_widget.hh \ +./demo/wizard/src/runner.hh \ ./draw/all.hh \ ./draw/bounding_box_links.hh \ ./draw/bounding_boxes.hh \ +./draw/groups_bboxes.hh \ ./estim/object_groups_v_thickness.hh \ ./filter/all.hh \ ./filter/common/objects_photo.hh \ +./filter/internal/alignment_angle.hh \ +./filter/internal/component_aligned.hh \ ./filter/internal/compute.hh \ ./filter/object_groups_size_ratio.hh \ ./filter/object_groups_small.hh \ ./filter/object_groups_v_thickness.hh \ +./filter/object_groups_with_holes.hh \ ./filter/object_links_bbox_h_ratio.hh \ ./filter/object_links_bbox_overlap.hh \ ./filter/object_links_bbox_ratio.hh \ ./filter/object_links_bbox_w_ratio.hh \ ./filter/object_links_bottom_aligned.hh \ ./filter/object_links_center_aligned.hh \ -./filter/object_links_non_aligned.hh \ +./filter/object_links_left_aligned.hh \ ./filter/object_links_non_aligned_simple.hh \ -./filter/object_links_non_h_aligned.hh \ -./filter/object_links_non_v_aligned.hh \ +./filter/object_links_right_aligned.hh \ ./filter/object_links_top_aligned.hh \ ./filter/objects_h_thick.hh \ ./filter/objects_h_thin.hh \ @@ -57,18 +139,34 @@ nobase_scribo_HEADERS = \ ./filter/objects_thin.hh \ ./filter/objects_v_thick.hh \ ./filter/objects_v_thin.hh \ +./filter/objects_with_holes.hh \ +./fun/v2b/label_to_bool.hh \ +./fun/v2b/objects_large_filter.hh \ ./fun/v2b/objects_small_filter.hh \ +./io/text_boxes/save.hh \ +./io/xml/save.hh \ ./make/all.hh \ ./make/debug_filename.hh \ ./make/influence_zone_graph.hh \ ./make/text.hh \ +./postprocessing/fill_object_holes.hh \ ./preprocessing/all.hh \ +./preprocessing/crop.hh \ +./preprocessing/crop_without_localization.hh \ +./preprocessing/denoise.hh \ +./preprocessing/denoise_bg.hh \ +./preprocessing/denoise_fg.hh \ +./preprocessing/deskew.hh \ +./preprocessing/deskew_crop.hh \ +./preprocessing/homogeneous_contrast.hh \ +./preprocessing/rotate_90.hh \ ./preprocessing/split_bg_fg.hh \ -./preprocessing/unskew.hh \ ./primitive/all.hh \ ./primitive/extract/all.hh \ ./primitive/extract/canvas.hh \ ./primitive/extract/cells.hh \ +./primitive/extract/components.hh \ +./primitive/extract/horizontal_separators.hh \ ./primitive/extract/lines_discontinued.hh \ ./primitive/extract/lines_h_discontinued.hh \ ./primitive/extract/lines_h_pattern.hh \ @@ -82,7 +180,8 @@ nobase_scribo_HEADERS = \ ./primitive/extract/lines_v_single.hh \ ./primitive/extract/lines_v_thick.hh \ ./primitive/extract/lines_v_thick_and_single.hh \ -./primitive/extract/objects.hh \ +./primitive/extract/separators.hh \ +./primitive/extract/vertical_separators.hh \ ./primitive/group/all.hh \ ./primitive/group/apply.hh \ ./primitive/group/from_double_link.hh \ @@ -90,26 +189,29 @@ nobase_scribo_HEADERS = \ ./primitive/group/from_single_link.hh \ ./primitive/internal/all.hh \ ./primitive/internal/find_graph_link.hh \ -./primitive/internal/find_left_link.hh \ -./primitive/internal/find_right_link.hh \ ./primitive/internal/find_root.hh \ ./primitive/internal/have_link_valid.hh \ -./primitive/internal/init_link_array.hh \ -./primitive/internal/is_invalid_link.hh \ ./primitive/internal/is_link_valid.hh \ +./primitive/internal/rd.hh \ ./primitive/internal/update_graph_link.hh \ ./primitive/internal/update_link_array.hh \ ./primitive/link/all.hh \ ./primitive/link/compute.hh \ ./primitive/link/compute_several.hh \ ./primitive/link/internal/anchors_3.hh \ +./primitive/link/internal/compute_anchor.hh \ +./primitive/link/internal/dmax_default.hh \ +./primitive/link/internal/dmax_functor_base.hh \ +./primitive/link/internal/dmax_width_and_height.hh \ +./primitive/link/internal/dmax_width_only.hh \ ./primitive/link/internal/find_link.hh \ ./primitive/link/internal/find_several_links.hh \ -./primitive/link/internal/link_center_dmax_base.hh \ -./primitive/link/internal/link_center_dmax_ratio_base.hh \ ./primitive/link/internal/link_functor_base.hh \ ./primitive/link/internal/link_ms_dmax_base.hh \ ./primitive/link/internal/link_ms_dmax_ratio_base.hh \ +./primitive/link/internal/link_several_dmax_base.hh \ +./primitive/link/internal/link_single_dmax_base.hh \ +./primitive/link/internal/link_single_dmax_ratio_base.hh \ ./primitive/link/merge_double_link.hh \ ./primitive/link/with_graph.hh \ ./primitive/link/with_rag.hh \ @@ -118,12 +220,58 @@ nobase_scribo_HEADERS = \ ./primitive/link/with_several_right_closest_links.hh \ ./primitive/link/with_several_right_links.hh \ ./primitive/link/with_several_right_links_overlap.hh \ +./primitive/link/with_single_down_link.hh \ ./primitive/link/with_single_left_link.hh \ ./primitive/link/with_single_left_link_dmax_ratio.hh \ ./primitive/link/with_single_right_link.hh \ ./primitive/link/with_single_right_link_bottom.hh \ ./primitive/link/with_single_right_link_dmax_ratio.hh \ ./primitive/link/with_single_right_link_top.hh \ +./primitive/link/with_single_up_link.hh \ +./primitive/regroup/from_single_left_link.hh \ +./primitive/remove/separators.hh \ +./sandbox/green/mln/accu/stat/histo1d.hh \ +./sandbox/green/mln/accu/stat/histo2d.hh \ +./sandbox/green/mln/accu/stat/histo3d_hsl.hh \ +./sandbox/green/mln/accu/stat/histo3d_rgb.hh \ +./sandbox/green/mln/clustering/k_mean.hh \ +./sandbox/green/mln/clustering/kmean1d.hh \ +./sandbox/green/mln/clustering/kmean2d.hh \ +./sandbox/green/mln/clustering/kmean3d.hh \ +./sandbox/green/mln/clustering/kmean_rgb.hh \ +./sandbox/green/mln/display/display_histo.hh \ +./sandbox/green/mln/display/project_histo.hh \ +./sandbox/green/mln/fun/p2b/achromatic.hh \ +./sandbox/green/mln/fun/p2b/component_equals.hh \ +./sandbox/green/mln/fun/v2v/achromatism.hh \ +./sandbox/green/mln/fun/v2v/hue_concentration.hh \ +./sandbox/green/mln/fun/v2v/int_u16_to_int_u14.hh \ +./sandbox/green/mln/fun/v2v/log.hh \ +./sandbox/green/mln/fun/v2v/rg_to_rgb.hh \ +./sandbox/green/mln/fun/v2v/rgb8_to_int_u8.hh \ +./sandbox/green/mln/fun/v2v/rgb8_to_rgbn.hh \ +./sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh \ +./sandbox/green/mln/fun/v2v/rgb_to_hsv.hh \ +./sandbox/green/mln/fun/v2v/rgb_to_hue_map.hh \ +./sandbox/green/mln/fun/v2v/rgb_to_rg.hh \ +./sandbox/green/mln/fun/v2v/rgb_to_saturation_map.hh \ +./sandbox/green/mln/fun/v2v/rgb_to_value_map.hh \ +./sandbox/green/mln/img_path.hh \ +./sandbox/green/mln/io/plot/save_image_sh.hh \ +./sandbox/green/mln/math/ceil.hh \ +./sandbox/green/mln/math/floor.hh \ +./sandbox/green/mln/value/hsv.hh \ +./sandbox/green/mln/value/rg.hh \ +./sandbox/green/ok/mln/accu/histo/histo1d.hh \ +./sandbox/green/ok/mln/accu/histo/histo2d.hh \ +./sandbox/green/ok/mln/accu/histo/histo3d.hh \ +./sandbox/green/ok/mln/img_path.hh \ +./src/afp/components.hh \ +./src/afp/link.hh \ +./src/afp/regroup.hh \ +./subsampling/bilinear.hh \ +./subsampling/integral.hh \ +./subsampling/integral_single_image.hh \ ./table/align_lines_horizontaly.hh \ ./table/align_lines_verticaly.hh \ ./table/all.hh \ @@ -140,10 +288,15 @@ nobase_scribo_HEADERS = \ ./table/repair_vertical_lines.hh \ ./text/all.hh \ ./text/clean.hh \ +./text/clean_inplace.hh \ ./text/extract_lines.hh \ +./text/look_like_text_lines.hh \ +./text/merging.hh \ ./text/recognition.hh \ -./util/all.hh \ -./util/text.hh +./toolchain/nepomuk/text_extraction.hh \ +./toolchain/text_in_doc.hh \ +./upsampling/bs2x.hh \ +./upsampling/eagle.hh #<<lrde nobase_scribo_HEADERS += diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index a37db3b..978822a 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -5,7 +5,6 @@ scribo_all \ scribo_binarization_global_threshold \ scribo_binarization_global_threshold_auto \ scribo_binarization_internal_first_pass_functor \ -scribo_binarization_internal_min_mean_max_stddev \ scribo_binarization_local_threshold \ scribo_binarization_sauvola \ scribo_binarization_sauvola_ms \ @@ -36,8 +35,10 @@ scribo_core_tag_line \ scribo_debug_alignment_decision_image \ scribo_debug_all \ scribo_debug_bboxes_enlarged_image \ +scribo_debug_char_space_image \ scribo_debug_decision_image \ scribo_debug_highlight_text_area \ +scribo_debug_line_info_image \ scribo_debug_links_decision_image \ scribo_debug_looks_like_a_text_line_image \ scribo_debug_mean_and_base_lines_image \ @@ -181,14 +182,11 @@ scribo_primitive_extract_vertical_separators \ scribo_primitive_group_all \ scribo_primitive_group_apply \ scribo_primitive_group_from_double_link \ -scribo_primitive_group_from_double_link_any \ scribo_primitive_group_from_graph \ scribo_primitive_group_from_single_link \ -scribo_primitive_group_from_single_link_robust \ scribo_primitive_internal_all \ scribo_primitive_internal_find_graph_link \ scribo_primitive_internal_find_root \ -scribo_primitive_internal_find_root_robust \ scribo_primitive_internal_have_link_valid \ scribo_primitive_internal_is_link_valid \ scribo_primitive_internal_rd \ @@ -222,28 +220,10 @@ scribo_primitive_link_with_single_left_link_dmax_ratio \ scribo_primitive_link_with_single_right_link \ scribo_primitive_link_with_single_right_link_bottom \ scribo_primitive_link_with_single_right_link_dmax_ratio \ -scribo_primitive_link_with_single_right_link_dmax_ratio_aligned \ scribo_primitive_link_with_single_right_link_top \ scribo_primitive_link_with_single_up_link \ scribo_primitive_regroup_from_single_left_link \ scribo_primitive_remove_separators \ -scribo_sandbox__julien_hough_hough_hough_pgm \ -scribo_sandbox__julien_hough_hough_hough_v1 \ -scribo_sandbox__julien_hough_hough_hough_v2 \ -scribo_sandbox__julien_hough_hough_hough_v3 \ -scribo_sandbox__julien_hough_hough_hough_v4 \ -scribo_sandbox__julien_hough_kht_buffer_2d \ -scribo_sandbox__julien_hough_kht_closing \ -scribo_sandbox__julien_hough_kht_eigen \ -scribo_sandbox__julien_hough_kht_filter \ -scribo_sandbox__julien_hough_kht_kht \ -scribo_sandbox__julien_hough_kht_linking \ -scribo_sandbox__julien_hough_kht_peak_detection \ -scribo_sandbox__julien_hough_kht_subdivision \ -scribo_sandbox__julien_hough_kht_types \ -scribo_sandbox__julien_hough_kht_voting \ -scribo_sandbox__julien_upsampling_eagle \ -scribo_sandbox__julien_upsampling_pyxies \ scribo_sandbox_green_mln_accu_stat_histo1d \ scribo_sandbox_green_mln_accu_stat_histo2d \ scribo_sandbox_green_mln_accu_stat_histo3d_hsl \ @@ -315,7 +295,6 @@ scribo_all_SOURCES = scribo_all.cc scribo_binarization_global_threshold_SOURCES = scribo_binarization_global_threshold.cc scribo_binarization_global_threshold_auto_SOURCES = scribo_binarization_global_threshold_auto.cc scribo_binarization_internal_first_pass_functor_SOURCES = scribo_binarization_internal_first_pass_functor.cc -scribo_binarization_internal_min_mean_max_stddev_SOURCES = scribo_binarization_internal_min_mean_max_stddev.cc scribo_binarization_local_threshold_SOURCES = scribo_binarization_local_threshold.cc scribo_binarization_sauvola_SOURCES = scribo_binarization_sauvola.cc scribo_binarization_sauvola_ms_SOURCES = scribo_binarization_sauvola_ms.cc @@ -346,8 +325,10 @@ scribo_core_tag_line_SOURCES = scribo_core_tag_line.cc scribo_debug_alignment_decision_image_SOURCES = scribo_debug_alignment_decision_image.cc scribo_debug_all_SOURCES = scribo_debug_all.cc scribo_debug_bboxes_enlarged_image_SOURCES = scribo_debug_bboxes_enlarged_image.cc +scribo_debug_char_space_image_SOURCES = scribo_debug_char_space_image.cc scribo_debug_decision_image_SOURCES = scribo_debug_decision_image.cc scribo_debug_highlight_text_area_SOURCES = scribo_debug_highlight_text_area.cc +scribo_debug_line_info_image_SOURCES = scribo_debug_line_info_image.cc scribo_debug_links_decision_image_SOURCES = scribo_debug_links_decision_image.cc scribo_debug_looks_like_a_text_line_image_SOURCES = scribo_debug_looks_like_a_text_line_image.cc scribo_debug_mean_and_base_lines_image_SOURCES = scribo_debug_mean_and_base_lines_image.cc @@ -491,14 +472,11 @@ scribo_primitive_extract_vertical_separators_SOURCES = scribo_primitive_extract_ scribo_primitive_group_all_SOURCES = scribo_primitive_group_all.cc scribo_primitive_group_apply_SOURCES = scribo_primitive_group_apply.cc scribo_primitive_group_from_double_link_SOURCES = scribo_primitive_group_from_double_link.cc -scribo_primitive_group_from_double_link_any_SOURCES = scribo_primitive_group_from_double_link_any.cc scribo_primitive_group_from_graph_SOURCES = scribo_primitive_group_from_graph.cc scribo_primitive_group_from_single_link_SOURCES = scribo_primitive_group_from_single_link.cc -scribo_primitive_group_from_single_link_robust_SOURCES = scribo_primitive_group_from_single_link_robust.cc scribo_primitive_internal_all_SOURCES = scribo_primitive_internal_all.cc scribo_primitive_internal_find_graph_link_SOURCES = scribo_primitive_internal_find_graph_link.cc scribo_primitive_internal_find_root_SOURCES = scribo_primitive_internal_find_root.cc -scribo_primitive_internal_find_root_robust_SOURCES = scribo_primitive_internal_find_root_robust.cc scribo_primitive_internal_have_link_valid_SOURCES = scribo_primitive_internal_have_link_valid.cc scribo_primitive_internal_is_link_valid_SOURCES = scribo_primitive_internal_is_link_valid.cc scribo_primitive_internal_rd_SOURCES = scribo_primitive_internal_rd.cc @@ -532,28 +510,10 @@ scribo_primitive_link_with_single_left_link_dmax_ratio_SOURCES = scribo_primitiv scribo_primitive_link_with_single_right_link_SOURCES = scribo_primitive_link_with_single_right_link.cc scribo_primitive_link_with_single_right_link_bottom_SOURCES = scribo_primitive_link_with_single_right_link_bottom.cc scribo_primitive_link_with_single_right_link_dmax_ratio_SOURCES = scribo_primitive_link_with_single_right_link_dmax_ratio.cc -scribo_primitive_link_with_single_right_link_dmax_ratio_aligned_SOURCES = scribo_primitive_link_with_single_right_link_dmax_ratio_aligned.cc scribo_primitive_link_with_single_right_link_top_SOURCES = scribo_primitive_link_with_single_right_link_top.cc scribo_primitive_link_with_single_up_link_SOURCES = scribo_primitive_link_with_single_up_link.cc scribo_primitive_regroup_from_single_left_link_SOURCES = scribo_primitive_regroup_from_single_left_link.cc scribo_primitive_remove_separators_SOURCES = scribo_primitive_remove_separators.cc -scribo_sandbox__julien_hough_hough_hough_pgm_SOURCES = scribo_sandbox__julien_hough_hough_hough_pgm.cc -scribo_sandbox__julien_hough_hough_hough_v1_SOURCES = scribo_sandbox__julien_hough_hough_hough_v1.cc -scribo_sandbox__julien_hough_hough_hough_v2_SOURCES = scribo_sandbox__julien_hough_hough_hough_v2.cc -scribo_sandbox__julien_hough_hough_hough_v3_SOURCES = scribo_sandbox__julien_hough_hough_hough_v3.cc -scribo_sandbox__julien_hough_hough_hough_v4_SOURCES = scribo_sandbox__julien_hough_hough_hough_v4.cc -scribo_sandbox__julien_hough_kht_buffer_2d_SOURCES = scribo_sandbox__julien_hough_kht_buffer_2d.cc -scribo_sandbox__julien_hough_kht_closing_SOURCES = scribo_sandbox__julien_hough_kht_closing.cc -scribo_sandbox__julien_hough_kht_eigen_SOURCES = scribo_sandbox__julien_hough_kht_eigen.cc -scribo_sandbox__julien_hough_kht_filter_SOURCES = scribo_sandbox__julien_hough_kht_filter.cc -scribo_sandbox__julien_hough_kht_kht_SOURCES = scribo_sandbox__julien_hough_kht_kht.cc -scribo_sandbox__julien_hough_kht_linking_SOURCES = scribo_sandbox__julien_hough_kht_linking.cc -scribo_sandbox__julien_hough_kht_peak_detection_SOURCES = scribo_sandbox__julien_hough_kht_peak_detection.cc -scribo_sandbox__julien_hough_kht_subdivision_SOURCES = scribo_sandbox__julien_hough_kht_subdivision.cc -scribo_sandbox__julien_hough_kht_types_SOURCES = scribo_sandbox__julien_hough_kht_types.cc -scribo_sandbox__julien_hough_kht_voting_SOURCES = scribo_sandbox__julien_hough_kht_voting.cc -scribo_sandbox__julien_upsampling_eagle_SOURCES = scribo_sandbox__julien_upsampling_eagle.cc -scribo_sandbox__julien_upsampling_pyxies_SOURCES = scribo_sandbox__julien_upsampling_pyxies.cc scribo_sandbox_green_mln_accu_stat_histo1d_SOURCES = scribo_sandbox_green_mln_accu_stat_histo1d.cc scribo_sandbox_green_mln_accu_stat_histo2d_SOURCES = scribo_sandbox_green_mln_accu_stat_histo2d.cc scribo_sandbox_green_mln_accu_stat_histo3d_hsl_SOURCES = scribo_sandbox_green_mln_accu_stat_histo3d_hsl.cc -- 1.5.6.5

1 0

last-svn-commit-424-g999dc98 scribo/text/merging.hh: Fix the path of an #include directive.
by Roland Levillain 21 Jul '10

21 Jul '10

--- scribo/ChangeLog | 4 ++++ scribo/text/merging.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 7edc90f..da9d095 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + * scribo/text/merging.hh: Fix the path of an #include directive. + +2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with the current interface of scribo::debug::usage. * scribo/src/debug/show_links_bottom_aligned.cc, diff --git a/scribo/text/merging.hh b/scribo/text/merging.hh index c7ad3b3..36d41c2 100644 --- a/scribo/text/merging.hh +++ b/scribo/text/merging.hh @@ -57,7 +57,7 @@ #include <mln/data/wrap.hh> #include <mln/util/timer.hh> -#include <text/look_like_text_lines.hh> +#include <scribo/text/look_like_text_lines.hh> namespace scribo -- 1.5.6.5

1 0