August 2010 - Olena-patches

last-svn-commit-493-g4131878 Rename examples.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

* src/binarization/fg_sauvola_ms.cc, * src/binarization/ppm_fg_sauvola_ms.cc: Rename as... * src/binarization/ppm_sauvola_ms_fg.cc, * src/binarization/sauvola_ms_fg.cc: ...this. --- scribo/ChangeLog | 10 ++++++++++ .../{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} | 0 .../{fg_sauvola_ms.cc => sauvola_ms_fg.cc} | 0 3 files changed, 10 insertions(+), 0 deletions(-) rename scribo/src/binarization/{ppm_fg_sauvola_ms.cc => ppm_sauvola_ms_fg.cc} (100%) rename scribo/src/binarization/{fg_sauvola_ms.cc => sauvola_ms_fg.cc} (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3bff0e4..b4a2256 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Rename examples. + + * src/binarization/fg_sauvola_ms.cc, + * src/binarization/ppm_fg_sauvola_ms.cc: Rename as... + + * src/binarization/ppm_sauvola_ms_fg.cc, + * src/binarization/sauvola_ms_fg.cc: ...this. + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/binarization/ppm_fg_sauvola_ms.cc b/scribo/src/binarization/ppm_sauvola_ms_fg.cc similarity index 100% rename from scribo/src/binarization/ppm_fg_sauvola_ms.cc rename to scribo/src/binarization/ppm_sauvola_ms_fg.cc diff --git a/scribo/src/binarization/fg_sauvola_ms.cc b/scribo/src/binarization/sauvola_ms_fg.cc similarity index 100% rename from scribo/src/binarization/fg_sauvola_ms.cc rename to scribo/src/binarization/sauvola_ms_fg.cc -- 1.5.6.5

1 0

last-svn-commit-492-g5e6b26d headers.mk: Regen.
by Guillaume Lazzara 26 Aug '10

26 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/headers.mk | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f839cc5..3bff0e4 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * headers.mk: Regen. + 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> Add a preprocessing toolchain. diff --git a/scribo/headers.mk b/scribo/headers.mk index 231742b..f421f92 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -196,6 +196,7 @@ scribo/text/merging.hh \ scribo/text/recognition.hh \ scribo/toolchain/nepomuk/text_extraction.hh \ scribo/toolchain/text_in_doc.hh \ +scribo/toolchain/text_in_doc_preprocess.hh \ scribo/upsampling/bs2x.hh \ scribo/upsampling/eagle.hh -- 1.5.6.5

1 0

branch distribute-scribo updated: last-svn-commit-493-gdca41a3
by lazzara＠lrde.epita.fr 25 Aug '10

25 Aug '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 distribute-scribo has been updated via dca41a34768ed67ea7a32c51742d3ae502bd12f2 (commit) from f75a6a28e9daa1d86f7988449ab8409eb4d2de3a (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 ----------------------------------------------------------------- dca41a3 tests/Makefile.am (EXTRA_DIST): Fix path to files. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-498-g8d50316 tests/Makefile.am (EXTRA_DIST): Fix path to files.
by Guillaume Lazzara 25 Aug '10

25 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f966b92..4e696ba 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Fix path to files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index a8397ef..852b22f 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -17,14 +17,14 @@ include $(srcdir)/tests.mk -EXTRA_DIST = \ - table_to_be_repaired.pbm \ - table_to_be_repaired2.pbm \ - table_to_be_repaired3.pbm \ - text_to_group.pbm \ - text_to_group.pgm \ - text_to_group_and_clean.pbm \ - wildly.pbm +EXTRA_DIST = \ + img/table_to_be_repaired.pbm \ + img/table_to_be_repaired2.pbm \ + img/table_to_be_repaired3.pbm \ + img/text_to_group.pbm \ + img/text_to_group.pgm \ + img/text_to_group_and_clean.pbm \ + img/wildly.pbm SUBDIRS = \ binarization \ -- 1.5.6.5

1 0

last-svn-commit-493-gdca41a3 tests/Makefile.am (EXTRA_DIST): Fix path to files.
by Guillaume Lazzara 25 Aug '10

25 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e434758..a750510 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Fix path to files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index a8397ef..852b22f 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -17,14 +17,14 @@ include $(srcdir)/tests.mk -EXTRA_DIST = \ - table_to_be_repaired.pbm \ - table_to_be_repaired2.pbm \ - table_to_be_repaired3.pbm \ - text_to_group.pbm \ - text_to_group.pgm \ - text_to_group_and_clean.pbm \ - wildly.pbm +EXTRA_DIST = \ + img/table_to_be_repaired.pbm \ + img/table_to_be_repaired2.pbm \ + img/table_to_be_repaired3.pbm \ + img/text_to_group.pbm \ + img/text_to_group.pgm \ + img/text_to_group_and_clean.pbm \ + img/wildly.pbm SUBDIRS = \ binarization \ -- 1.5.6.5

1 0

branch distribute-scribo updated: last-svn-commit-492-gf75a6a2
by lazzara＠lrde.epita.fr 25 Aug '10

25 Aug '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 distribute-scribo has been updated via f75a6a28e9daa1d86f7988449ab8409eb4d2de3a (commit) from 947f6e451ca08a9c55e780da8795ae2b50987af1 (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 ----------------------------------------------------------------- f75a6a2 tests/Makefile.am (EXTRA_DIST): Add new files. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-497-g86afde1 tests/Makefile.am (EXTRA_DIST): Add new files.
by Guillaume Lazzara 25 Aug '10

25 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e2b1ea1..f966b92 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Re-enable 'table' directory in SUBDIRS. * src/Makefile.am, diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index 4214e37..a8397ef 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -16,6 +17,15 @@ include $(srcdir)/tests.mk +EXTRA_DIST = \ + table_to_be_repaired.pbm \ + table_to_be_repaired2.pbm \ + table_to_be_repaired3.pbm \ + text_to_group.pbm \ + text_to_group.pgm \ + text_to_group_and_clean.pbm \ + wildly.pbm + SUBDIRS = \ binarization \ core \ -- 1.5.6.5

1 0

last-svn-commit-492-gf75a6a2 tests/Makefile.am (EXTRA_DIST): Add new files.
by Guillaume Lazzara 25 Aug '10

25 Aug '10

--- scribo/ChangeLog | 4 ++++ scribo/tests/Makefile.am | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f03d899..e434758 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/Makefile.am (EXTRA_DIST): Add new files. + +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Re-enable 'table' directory in SUBDIRS. * src/Makefile.am, diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index 4214e37..a8397ef 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -16,6 +17,15 @@ include $(srcdir)/tests.mk +EXTRA_DIST = \ + table_to_be_repaired.pbm \ + table_to_be_repaired2.pbm \ + table_to_be_repaired3.pbm \ + text_to_group.pbm \ + text_to_group.pgm \ + text_to_group_and_clean.pbm \ + wildly.pbm + SUBDIRS = \ binarization \ core \ -- 1.5.6.5

1 0

branch distribute-scribo updated: last-svn-commit-491-g947f6e4
by lazzara＠lrde.epita.fr 25 Aug '10

25 Aug '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 distribute-scribo has been updated via 947f6e451ca08a9c55e780da8795ae2b50987af1 (commit) from 8464d5567563b91c8c58a8a2214f3a8c5a8ab64f (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 ----------------------------------------------------------------- 947f6e4 Re-enable 'table' directory in SUBDIRS. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 10 ++++++++++ scribo/src/Makefile.am | 4 +--- scribo/src/table/Makefile.am | 24 ++++++++++++++---------- scribo/tests/Makefile.am | 5 +---- scribo/tests/table/Makefile.am | 12 +++++++----- 5 files changed, 33 insertions(+), 22 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-496-geeb2374 Re-enable 'table' directory in SUBDIRS.
by Guillaume Lazzara 25 Aug '10

25 Aug '10

* src/Makefile.am, * tests/Makefile.am (SUBDIRS): Add table. * src/table/Makefile.am, * tests/table/Makefile.am: Disable tests. --- scribo/ChangeLog | 10 ++++++++++ scribo/src/Makefile.am | 4 +--- scribo/src/table/Makefile.am | 24 ++++++++++++++---------- scribo/tests/Makefile.am | 5 +---- scribo/tests/table/Makefile.am | 12 +++++++----- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b4a2256..e2b1ea1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2010-08-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Re-enable 'table' directory in SUBDIRS. + + * src/Makefile.am, + * tests/Makefile.am (SUBDIRS): Add table. + + * src/table/Makefile.am, + * tests/table/Makefile.am: Disable tests. + 2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> Rename examples. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 52df66d..bb77740 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -26,11 +26,9 @@ SUBDIRS = \ misc \ postprocessing \ preprocessing \ + table \ text -# Disabled for the moment: -# table - bin_PROGRAMS = diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 7fc7008..50ea8fd 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -16,14 +16,18 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - erase \ - extract \ - rebuild_opening \ - rebuild_rank +bin_PROGRAMS = - -erase_SOURCES = erase.cc -extract_SOURCES = extract.cc -rebuild_opening_SOURCES = rebuild_opening.cc -rebuild_rank_SOURCES = rebuild_rank.cc +# Disabled: +#---------- +# +#bin_PROGRAMS = \ +# erase \ +# extract \ +# rebuild_opening \ +# rebuild_rank +# +#erase_SOURCES = erase.cc +#extract_SOURCES = extract.cc +#rebuild_opening_SOURCES = rebuild_opening.cc +#rebuild_rank_SOURCES = rebuild_rank.cc diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index a6ed969..4214e37 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -21,14 +21,11 @@ SUBDIRS = \ core \ filter \ preprocessing \ + table \ text \ toolchain \ unit_test -# Disabled directories: -# -# table - # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += unit_test diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 3427e6b..d7564e1 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -16,11 +16,13 @@ include $(top_srcdir)/scribo/tests/tests.mk -check_PROGRAMS = \ - extract_lines_with_rank \ - repair_lines +check_PROGRAMS = -extract_lines_with_rank_SOURCES = extract_lines_with_rank.cc -repair_lines_SOURCES = repair_lines.cc +# check_PROGRAMS = \ +# extract_lines_with_rank \ +# repair_lines + +# extract_lines_with_rank_SOURCES = extract_lines_with_rank.cc +# repair_lines_SOURCES = repair_lines.cc TESTS = $(check_PROGRAMS) -- 1.5.6.5

1 0