Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-423-gd791a85 Catch up with the current interface of scribo::debug::usage.

by Roland Levillain

* scribo/src/debug/show_links_bottom_aligned.cc, * scribo/src/debug/show_links_top_aligned.cc, * scribo/src/misc/negate.cc, * scribo/src/misc/superpose.cc, * scribo/src/preprocessing/split_bg_fg.cc, * scribo/src/primitive/extract/lines_pattern.cc, * scribo/src/primitive/find/find_pattern_lines.cc: Here. --- scribo/ChangeLog | 13 +++++++++++++ scribo/src/debug/show_links_bottom_aligned.cc | 13 ++++++++++--- scribo/src/debug/show_links_top_aligned.cc | 13 ++++++++++--- scribo/src/misc/negate.cc | 12 ++++++++++-- scribo/src/misc/superpose.cc | 15 +++++++++++---- scribo/src/preprocessing/split_bg_fg.cc | 12 ++++++++++-- scribo/src/primitive/extract/lines_pattern.cc | 13 ++++++++++--- scribo/src/primitive/find/find_pattern_lines.cc | 13 ++++++++++--- 8 files changed, 84 insertions(+), 20 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 066501b..7edc90f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 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, + * scribo/src/debug/show_links_top_aligned.cc, + * scribo/src/misc/negate.cc, + * scribo/src/misc/superpose.cc, + * scribo/src/preprocessing/split_bg_fg.cc, + * scribo/src/primitive/extract/lines_pattern.cc, + * scribo/src/primitive/find/find_pattern_lines.cc: + Here. + +2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + Disable programs still using object_image instead of component_set. * scribo/src/Makefile.am, diff --git a/scribo/src/debug/show_links_bottom_aligned.cc b/scribo/src/debug/show_links_bottom_aligned.cc index 337032a..4054d66 100644 --- a/scribo/src/debug/show_links_bottom_aligned.cc +++ b/scribo/src/debug/show_links_bottom_aligned.cc @@ -1,4 +1,4 @@ -// 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. // @@ -67,8 +67,15 @@ int main(int argc, char* argv[]) return scribo::debug::usage(argv, "Show valid or invalid links according the horizontal alignment (based on bottom line).", "input.pbm max_dist max_alpha output.ppm", - args_desc, - "A color image. Valid links are drawn in green, invalid ones in red."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Valid links are drawn in green, invalid ones in red." +#endif +); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/debug/show_links_top_aligned.cc b/scribo/src/debug/show_links_top_aligned.cc index ff01221..6f1d28a 100644 --- a/scribo/src/debug/show_links_top_aligned.cc +++ b/scribo/src/debug/show_links_top_aligned.cc @@ -1,4 +1,4 @@ -// 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. // @@ -65,8 +65,15 @@ int main(int argc, char* argv[]) return scribo::debug::usage(argv, "Show valid or invalid links according the horizontal alignment (based on top line).", "input.pbm max_dist max_alpha output.ppm", - args_desc, - "A color image. Valid links are drawn in green, invalid ones in red."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Valid links are drawn in green, invalid ones in red." +#endif +); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/misc/negate.cc b/scribo/src/misc/negate.cc index 9c35f1c..a807d95 100644 --- a/scribo/src/misc/negate.cc +++ b/scribo/src/misc/negate.cc @@ -1,4 +1,4 @@ -// 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. // @@ -46,7 +46,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Negate a binary image", "input.pbm output.pbm", - args_desc, "A binary image."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A binary image." +#endif + ); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/misc/superpose.cc b/scribo/src/misc/superpose.cc index 8449987..0307fa2 100644 --- a/scribo/src/misc/superpose.cc +++ b/scribo/src/misc/superpose.cc @@ -1,4 +1,4 @@ -// 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. // @@ -49,9 +49,16 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Superpose two binary images", "input.pbm data.pbm output.ppm", - args_desc, - "A color image. Data from 'data.pbm' is \ -colored in red."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Data from 'data.pbm' is " + "colored in red." +#endif + ); image2d<bool> input; io::pbm::load(input, argv[1]); diff --git a/scribo/src/preprocessing/split_bg_fg.cc b/scribo/src/preprocessing/split_bg_fg.cc index de7bd02..aa75758 100644 --- a/scribo/src/preprocessing/split_bg_fg.cc +++ b/scribo/src/preprocessing/split_bg_fg.cc @@ -1,4 +1,4 @@ -// 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. // @@ -51,7 +51,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Split background and foreground.", "input.pbm lambda delta fg.ppm bg.ppm", - args_desc, "The foreground image."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "The foreground image." +#endif + ); typedef image2d<value::rgb8> I; I input; diff --git a/scribo/src/primitive/extract/lines_pattern.cc b/scribo/src/primitive/extract/lines_pattern.cc index d794c71..1eabacb 100644 --- a/scribo/src/primitive/extract/lines_pattern.cc +++ b/scribo/src/primitive/extract/lines_pattern.cc @@ -1,4 +1,4 @@ -// 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. // @@ -51,8 +51,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Extract horizontal lines patterns", "input.pbm length delta output.pbm", - args_desc, - "A binary image of lines."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A binary image of lines." +#endif + ); trace::entering("main"); diff --git a/scribo/src/primitive/find/find_pattern_lines.cc b/scribo/src/primitive/find/find_pattern_lines.cc index 3d8a98f..152d16a 100644 --- a/scribo/src/primitive/find/find_pattern_lines.cc +++ b/scribo/src/primitive/find/find_pattern_lines.cc @@ -1,4 +1,4 @@ -// 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. // @@ -54,8 +54,15 @@ int main(int argc, char *argv[]) return scribo::debug::usage(argv, "Extract discontinued horizontal and vertical lines", "input.pbm length output.ppm", - args_desc, - "A color image. Horizontal lines are in red and vertical lines in green."); + args_desc + /* FIXME: According to the current + prototype of scribo::debug::usage, + the fifth argument (`out_desc') is + no longer supported. */ +#if 0 + , "A color image. Horizontal lines are in red and vertical lines in green." +#endif + ); trace::entering("main"); -- 1.5.6.5

14 years, 11 months

last-svn-commit-422-g74dd34a Disable programs still using object_image instead of component_set.

by Roland Levillain

* scribo/src/Makefile.am, * scribo/src/debug/Makefile.am, * scribo/src/filter/Makefile.am, * scribo/src/preprocessing/Makefile.am, * scribo/src/primitive/extract/Makefile.am, * scribo/src/primitive/find/Makefile.am, * scribo/src/primitive/group/Makefile.am, * scribo/src/table/Makefile.am, * scribo/src/text/Makefile.am: Here. --- scribo/ChangeLog | 15 +++++ scribo/src/Makefile.am | 9 ++- scribo/src/debug/Makefile.am | 96 +++++++++++++++--------------- scribo/src/filter/Makefile.am | 29 +++++---- scribo/src/preprocessing/Makefile.am | 25 ++++---- scribo/src/primitive/extract/Makefile.am | 27 +++++---- scribo/src/primitive/find/Makefile.am | 25 ++++---- scribo/src/primitive/group/Makefile.am | 37 ++++++------ scribo/src/table/Makefile.am | 22 ++++---- scribo/src/text/Makefile.am | 11 ++- 10 files changed, 164 insertions(+), 132 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bd3f45d..066501b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,18 @@ +2010-07-21 Roland Levillain <roland(a)lrde.epita.fr> + + Disable programs still using object_image instead of component_set. + + * scribo/src/Makefile.am, + * scribo/src/debug/Makefile.am, + * scribo/src/filter/Makefile.am, + * scribo/src/preprocessing/Makefile.am, + * scribo/src/primitive/extract/Makefile.am, + * scribo/src/primitive/find/Makefile.am, + * scribo/src/primitive/group/Makefile.am, + * scribo/src/table/Makefile.am, + * scribo/src/text/Makefile.am: + Here. + 2010-07-06 Guillaume Lazzara <z(a)lrde.epita.fr> Compilation related fixes in Scribo. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index a7dd7bc..5389fad 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -29,11 +29,14 @@ SUBDIRS = \ table \ text -bin_PROGRAMS = \ - pbm_lines_in_doc +bin_PROGRAMS = +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## pbm_lines_in_doc -pbm_lines_in_doc_SOURCES = pbm_lines_in_doc.cc + +## pbm_lines_in_doc_SOURCES = pbm_lines_in_doc.cc if HAVE_TESSERACT diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index f3dd4f9..0e3e82f 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -17,61 +17,63 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - show_info_x_height \ +bin_PROGRAMS = \ + show_info_x_height \ show_info_median_inter_characters \ - show_links_left_right_links_validation \ - show_links_bbox_h_ratio \ - show_links_bbox_overlap \ - show_links_bottom_aligned \ - show_links_center_aligned \ - show_links_non_h_aligned \ - show_links_several_right \ - show_links_several_right_overlap \ - show_links_single_down \ - show_links_single_down_left_aligned \ - show_links_single_down_right_aligned \ - show_links_single_left \ - show_links_single_left_dmax_ratio \ - show_links_single_right \ - show_links_single_right_dmax_ratio \ - show_links_single_up \ - show_links_single_up_left_aligned \ - show_links_single_up_right_aligned \ - show_links_top_aligned \ - show_objects_large \ - show_objects_large_small \ - show_objects_small \ - show_objects_thick \ - show_objects_thin + show_links_left_right_links_validation \ + show_links_bbox_h_ratio \ + show_links_bottom_aligned \ + show_links_top_aligned +### FIXME: Does not compile, disabled. +## bin_PROGRAMS += \ +## show_links_bbox_overlap \ +## show_links_center_aligned \ +## show_links_non_h_aligned \ +## show_links_several_right \ +## show_links_several_right_overlap \ +## show_links_single_down \ +## show_links_single_down_left_aligned \ +## show_links_single_down_right_aligned \ +## show_links_single_left \ +## show_links_single_left_dmax_ratio \ +## show_links_single_right \ +## show_links_single_right_dmax_ratio \ +## show_links_single_up \ +## show_links_single_up_left_aligned \ +## show_links_single_up_right_aligned \ +## show_objects_large \ +## show_objects_large_small \ +## show_objects_small \ +## show_objects_thick \ +## show_objects_thin show_info_x_height_SOURCES = show_info_x_height.cc show_info_median_inter_characters_SOURCES = show_info_median_inter_characters.cc show_links_left_right_links_validation_SOURCES = show_links_left_right_links_validation.cc show_links_bbox_h_ratio_SOURCES = show_links_bbox_h_ratio.cc -show_links_bbox_overlap_SOURCES = show_links_bbox_overlap.cc +## show_links_bbox_overlap_SOURCES = show_links_bbox_overlap.cc show_links_bottom_aligned_SOURCES = show_links_bottom_aligned.cc -show_links_center_aligned_SOURCES = show_links_center_aligned.cc -show_links_non_h_aligned_SOURCES = show_links_non_h_aligned.cc -show_links_several_right_SOURCES = show_links_several_right.cc -show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc -show_links_single_down_SOURCES = show_links_single_down.cc -show_links_single_down_left_aligned_SOURCES = show_links_single_down_left_aligned.cc -show_links_single_down_right_aligned_SOURCES = show_links_single_down_right_aligned.cc -show_links_single_left_SOURCES = show_links_single_left.cc -show_links_single_left_dmax_ratio_SOURCES = show_links_single_left_dmax_ratio.cc -show_links_single_right_SOURCES = show_links_single_right.cc -show_links_single_right_dmax_ratio_SOURCES = show_links_single_right_dmax_ratio.cc -show_links_single_up_SOURCES = show_links_single_up.cc -show_links_single_up_left_aligned_SOURCES = show_links_single_up_left_aligned.cc -show_links_single_up_right_aligned_SOURCES = show_links_single_up_right_aligned.cc +## show_links_center_aligned_SOURCES = show_links_center_aligned.cc +## show_links_non_h_aligned_SOURCES = show_links_non_h_aligned.cc +## show_links_several_right_SOURCES = show_links_several_right.cc +## show_links_several_right_overlap_SOURCES = show_links_several_right_overlap.cc +## show_links_single_down_SOURCES = show_links_single_down.cc +## show_links_single_down_left_aligned_SOURCES = show_links_single_down_left_aligned.cc +## show_links_single_down_right_aligned_SOURCES = show_links_single_down_right_aligned.cc +## show_links_single_left_SOURCES = show_links_single_left.cc +## show_links_single_left_dmax_ratio_SOURCES = show_links_single_left_dmax_ratio.cc +## show_links_single_right_SOURCES = show_links_single_right.cc +## show_links_single_right_dmax_ratio_SOURCES = show_links_single_right_dmax_ratio.cc +## show_links_single_up_SOURCES = show_links_single_up.cc +## show_links_single_up_left_aligned_SOURCES = show_links_single_up_left_aligned.cc +## show_links_single_up_right_aligned_SOURCES = show_links_single_up_right_aligned.cc show_links_top_aligned_SOURCES = show_links_top_aligned.cc -show_objects_large_SOURCES = show_objects_large.cc -show_objects_large_small_SOURCES = show_objects_large_small.cc -show_objects_small_SOURCES = show_objects_small.cc -show_objects_thick_SOURCES = show_objects_thick.cc -show_objects_thin_SOURCES = show_objects_thin.cc +## show_objects_large_SOURCES = show_objects_large.cc +## show_objects_large_small_SOURCES = show_objects_large_small.cc +## show_objects_small_SOURCES = show_objects_small.cc +## show_objects_thick_SOURCES = show_objects_thick.cc +## show_objects_thin_SOURCES = show_objects_thin.cc if HAVE_MAGICKXX @@ -80,6 +82,6 @@ if HAVE_MAGICKXX highlight_text_area_CPPFLAGS = $(AM_CPPFLAGS) \ `Magick++-config --cppflags` highlight_text_area_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread `Magick++-config --libs` + -lpthread `Magick++-config --libs` endif HAVE_MAGICKXX diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am index 4e2b8d1..f85fcf1 100644 --- a/scribo/src/filter/Makefile.am +++ b/scribo/src/filter/Makefile.am @@ -1,4 +1,4 @@ -# 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,17 +16,18 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - objects_large \ - objects_small \ - objects_thick \ - objects_thin \ - objects_with_holes \ - objects_with_holes_pgm +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## objects_large \ +## objects_small \ +## objects_thick \ +## objects_thin \ +## objects_with_holes \ +## objects_with_holes_pgm -objects_large_SOURCES = objects_large.cc -objects_small_SOURCES = objects_small.cc -objects_thick_SOURCES = objects_thick.cc -objects_thin_SOURCES = objects_thin.cc -objects_with_holes_SOURCES = objects_with_holes.cc -objects_with_holes_pgm_SOURCES = objects_with_holes_pgm.cc +## objects_large_SOURCES = objects_large.cc +## objects_small_SOURCES = objects_small.cc +## objects_thick_SOURCES = objects_thick.cc +## objects_thin_SOURCES = objects_thin.cc +## objects_with_holes_SOURCES = objects_with_holes.cc +## objects_with_holes_pgm_SOURCES = objects_with_holes_pgm.cc diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 8b99bf2..d04d08b 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -17,20 +17,23 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - denoise_bg \ - denoise_fg \ - homogeneous_contrast \ - preprocess \ - split_bg_fg \ - unskew +bin_PROGRAMS = \ + denoise_bg \ + denoise_fg \ + homogeneous_contrast \ + split_bg_fg + +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## preprocess \ +## unskew denoise_bg_SOURCES = denoise_bg.cc denoise_fg_SOURCES = denoise_fg.cc homogeneous_contrast_SOURCES = homogeneous_contrast.cc -preprocess_SOURCES = preprocess.cc +## preprocess_SOURCES = preprocess.cc split_bg_fg_SOURCES = split_bg_fg.cc -unskew_SOURCES = unskew.cc +## unskew_SOURCES = unskew.cc if HAVE_MAGICKXX @@ -51,8 +54,8 @@ if HAVE_MAGICKXX `Magick++-config --cppflags` to_pgm_LDFLAGS = $(AM_LDFLAGS) \ - $(TESSERACT_LDFLAGS) \ - -lpthread `Magick++-config --libs` + $(TESSERACT_LDFLAGS) \ + -lpthread `Magick++-config --libs` bin_PROGRAMS += subsample subsample_SOURCES = subsample.cc diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 6f20ea3..17cdbf6 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -1,4 +1,4 @@ -# 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. # @@ -17,17 +17,20 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - extract_discontinued_lines \ - extract_discontinued_vlines \ - extract_discontinued_hlines \ - extract_thick_vlines \ - extract_thick_hlines \ +bin_PROGRAMS = \ lines_pattern -extract_discontinued_lines_SOURCES = extract_discontinued_lines.cc -extract_discontinued_vlines_SOURCES = extract_discontinued_vlines.cc -extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc -extract_thick_vlines_SOURCES = extract_thick_vlines.cc -extract_thick_hlines_SOURCES = extract_thick_hlines.cc +### FIXME: Does not compile, disabled. +## bin_PROGRAMS += \ +## extract_discontinued_lines \ +## extract_discontinued_vlines \ +## extract_discontinued_hlines \ +## extract_thick_vlines \ +## extract_thick_hlines + +## extract_discontinued_lines_SOURCES = extract_discontinued_lines.cc +## extract_discontinued_vlines_SOURCES = extract_discontinued_vlines.cc +## extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc +## extract_thick_vlines_SOURCES = extract_thick_vlines.cc +## extract_thick_hlines_SOURCES = extract_thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am index 3b5dbd2..15ba99f 100644 --- a/scribo/src/primitive/find/Makefile.am +++ b/scribo/src/primitive/find/Makefile.am @@ -1,4 +1,4 @@ -# 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. # @@ -17,15 +17,18 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - find_discontinued_lines \ - find_pattern_lines \ - find_single_lines \ - find_thick_lines \ - find_thick_and_single_lines +bin_PROGRAMS = \ + find_pattern_lines -find_discontinued_lines_SOURCES = find_discontinued_lines.cc +### FIXME: Does not compile, disabled. +## bin_PROGRAMS += \ +## find_discontinued_lines \ +## find_thick_lines \ +## find_single_lines \ +## find_thick_and_single_lines + +## find_discontinued_lines_SOURCES = find_discontinued_lines.cc find_pattern_lines_SOURCES = find_pattern_lines.cc -find_single_lines_SOURCES = find_single_lines.cc -find_thick_lines_SOURCES = find_thick_lines.cc -find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc +## find_single_lines_SOURCES = find_single_lines.cc +## find_thick_lines_SOURCES = find_thick_lines.cc +## find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index 92a81fc..aaf97d9 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -1,4 +1,4 @@ -# 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,23 +16,22 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - group_from_double_link \ - group_from_double_link_filter_non_aligned \ - group_from_double_several_links \ - group_from_graph \ - group_from_several_graph \ - group_from_several_left_links \ - group_from_single_link +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## group_from_double_link \ +## group_from_double_link_filter_non_aligned \ +## group_from_double_several_links \ +## group_from_graph \ +## group_from_rag \ +## group_from_several_graph \ +## group_from_several_left_links \ +## group_from_single_link -group_from_double_link_SOURCES = group_from_double_link.cc -group_from_double_link_filter_non_aligned_SOURCES = group_from_double_link_filter_non_aligned.cc -group_from_double_several_links_SOURCES = group_from_double_several_links.cc -group_from_graph_SOURCES = group_from_graph.cc -group_from_several_graph_SOURCES = group_from_several_graph.cc -group_from_several_left_links_SOURCES = group_from_several_left_links.cc -group_from_single_link_SOURCES = group_from_single_link.cc - -## FIXME: Does not compile. -## bin_PROGRAMS += group_from_rag +## group_from_double_link_SOURCES = group_from_double_link.cc +## group_from_double_link_filter_non_aligned_SOURCES = group_from_double_link_filter_non_aligned.cc +## group_from_double_several_links_SOURCES = group_from_double_several_links.cc +## group_from_graph_SOURCES = group_from_graph.cc +## group_from_several_graph_SOURCES = group_from_several_graph.cc +## group_from_several_left_links_SOURCES = group_from_several_left_links.cc +## group_from_single_link_SOURCES = group_from_single_link.cc ## group_from_rag_SOURCES = group_from_rag.cc diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 7fc7008..fc9fcf5 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -1,4 +1,4 @@ -# 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,14 +16,14 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - erase \ - extract \ - rebuild_opening \ - rebuild_rank +### FIXME: Does not compile, 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 +## erase_SOURCES = erase.cc +## extract_SOURCES = extract.cc +## rebuild_opening_SOURCES = rebuild_opening.cc +## rebuild_rank_SOURCES = rebuild_rank.cc diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index fc03ae8..6c41c2b 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -1,4 +1,4 @@ -# 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,11 +16,14 @@ include $(top_srcdir)/scribo/scribo.mk -bin_PROGRAMS = \ - cleantxt +bin_PROGRAMS = +### FIXME: Does not compile, disabled. +## bin_PROGRAMS = \ +## cleantxt -cleantxt_SOURCES = cleantxt.cc + +## cleantxt_SOURCES = cleantxt.cc if HAVE_TESSERACT -- 1.5.6.5

14 years, 11 months

branch exp/scribo-arthur updated: last-svn-commit-242-g61e1870

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/scribo-arthur has been updated via 61e1870fd06af56ae92ef1cf37b408f443541d9f (commit) from 4cd4e670baa5085a837175ff30bc65f3a4a08dea (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 ----------------------------------------------------------------- 61e1870 Fix Segfault bug in Qt interface. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 6 ++++++ scribo/demo/viewer/viewer.cc | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 11 months

last-svn-commit-242-g61e1870 Fix Segfault bug in Qt interface.

by Arthur Crepin-Leblond

* demo/viewer/viewer.cc: Clean vectors when load new picture. --- scribo/ChangeLog | 6 ++++++ scribo/demo/viewer/viewer.cc | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3f24ec5..b7737d3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + Fix Segfault bug in Qt interface. + + * demo/viewer/viewer.cc: Clean vectors when load new picture. + +2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + Small changes in xml_transform. * scribo/sandbox/arthur/xml_transform/README diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 10c1a43..36b8d82 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -331,18 +331,17 @@ Viewer::add_region(QDomNode father, QString attr_id) void Viewer::load_xml(QString filename) { - text_vector_.clear(); - image_vector_.clear(); - app_->setOverrideCursor(QCursor(Qt::WaitCursor)); emit fill_xml(filename); if (image_ && image_->scene() && image_->scene() == scene_) scene_->removeItem(image_); + text_vector_.clear(); + image_vector_.clear(); scene_->clear(); - if (!base64_ && use_image_) + if (!base64_ && use_image_ && image_) scene_->addItem(image_); scene_->update(); @@ -470,7 +469,7 @@ Viewer::load_xml(QString filename) region = region.nextSibling(); } - emit updated(); + //emit updated(); scene_->update(); key_wgt_->update_all(); @@ -483,8 +482,11 @@ Viewer::load(QString filename, bool b) app_->setOverrideCursor(QCursor(Qt::WaitCursor)); scene_->clear(); + text_vector_.clear(); + image_vector_.clear(); scene_->update(); image_ = 0; + xml_file_ = QString::Null(); // Load the image in a pixmap that is directly shown on screen. // This is very slow when used with the normal rendering system. -- 1.5.6.5

14 years, 11 months

last-svn-commit-421-gd8c4e94 INSTALL: Update. Automagically updated by autoconf.

by Guillaume Lazzara

--- ChangeLog | 4 + INSTALL | 200 +++++++++++-------------------------------------------------- 2 files changed, 40 insertions(+), 164 deletions(-) diff --git a/ChangeLog b/ChangeLog index b41d019..0883a33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + * INSTALL: Update. Automagically updated by autoconf. + +2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + * m4/autotroll.m4: Fix invalid configuration when Qt is missing. 2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/INSTALL b/INSTALL index 7d1c323..d3c5b40 100644 --- a/INSTALL +++ b/INSTALL @@ -2,24 +2,18 @@ Installation Instructions ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +2006, 2007 Free Software Foundation, Inc. - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should +Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -48,7 +42,7 @@ may remove or edit it. you want to change it or regenerate `configure' using a newer version of `autoconf'. - The simplest way to compile this package is: +The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -59,22 +53,12 @@ of `autoconf'. 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. + the package. 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the + documentation. + + 5. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -83,22 +67,15 @@ of `autoconf'. all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. + 6. Often, you can also type `make uninstall' to remove the installed + files again. Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -111,41 +88,25 @@ is an example: Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +source code in the directory that `configure' is in and in `..'. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - Installation Names ================== - By default, `make install' installs the package's commands under +By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -156,47 +117,16 @@ Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= +you can set and what kinds of files go in them. If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -208,53 +138,14 @@ find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -262,8 +153,7 @@ type, such as `sun4', or a canonical name which has the form: where SYSTEM can have one of these forms: - OS - KERNEL-OS + OS KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -281,9 +171,9 @@ eventually be run) with `--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -292,7 +182,7 @@ A warning: not all `configure' scripts look for a site script. Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -311,19 +201,11 @@ an Autoconf bug. Until the bug is fixed you can use this workaround: `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + Print a summary of the options to `configure', and exit. `--version' `-V' @@ -350,16 +232,6 @@ operates. Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. -- 1.5.6.5

14 years, 11 months

branch exp/scribo-arthur created: last-svn-commit-241-g4cd4e67

by git＠lrde.epita.fr

14 years, 11 months

branch exp/scribo-arthur deleted: last-svn-commit

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/scribo-arthur has been deleted was c9b6114cfa70fc440835c55a665a67feca0a1cfa ----------------------------------------------------------------------- c9b6114cfa70fc440835c55a665a67feca0a1cfa doc/white_paper/white_paper.tex: Fix an invalid URL. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 11 months

branch exp/scribo-arthur created: last-svn-commit

by git＠lrde.epita.fr

14 years, 11 months

branch origin/exp/scribo-arthur deleted: last-svn-commit

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch origin/exp/scribo-arthur has been deleted was c9b6114cfa70fc440835c55a665a67feca0a1cfa ----------------------------------------------------------------------- c9b6114cfa70fc440835c55a665a67feca0a1cfa doc/white_paper/white_paper.tex: Fix an invalid URL. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 11 months

branch origin/exp/scribo-arthur created: last-svn-commit

by git＠lrde.epita.fr

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches