* scribo/headers.mk, * scribo/tests/unit_test/unit-tests.mk: Regen. * scribo/tests/unit_test/cond_tests_qt: Add scribo/io/xml/load.hh. --- scribo/ChangeLog | 9 +++++++++ scribo/headers.mk | 13 ++++++++++++- scribo/tests/unit_test/cond_tests_qt | 1 + scribo/tests/unit_test/unit-tests.mk | 30 +++++++++++++++++++++++++++--- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bbd0cf2..4eae5f8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2011-03-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen mk files. + + * scribo/headers.mk, + * scribo/tests/unit_test/unit-tests.mk: Regen. + + * scribo/tests/unit_test/cond_tests_qt: Add scribo/io/xml/load.hh. + 2011-03-01 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/primitive/extract/non_text.hh: Remove debug. diff --git a/scribo/headers.mk b/scribo/headers.mk index 7603f8a..0b21a3f 100644 --- a/scribo/headers.mk +++ b/scribo/headers.mk @@ -14,17 +14,22 @@ scribo/binarization/sauvola_ms.hh \ scribo/binarization/sauvola_ms_split.hh \ scribo/binarization/sauvola_threshold_image.hh \ scribo/canvas/integral_browsing.hh \ +scribo/convert/from_base64.hh \ scribo/convert/from_qimage.hh \ +scribo/convert/to_base64.hh \ scribo/core/all.hh \ scribo/core/central_sites.hh \ scribo/core/component_info.hh \ scribo/core/component_set.hh \ scribo/core/concept/dmax_functor.hh \ scribo/core/concept/link_functor.hh \ +scribo/core/concept/serializable.hh \ +scribo/core/concept/serialize_visitor.hh \ scribo/core/def/lbl_type.hh \ scribo/core/document.hh \ scribo/core/erase_objects.hh \ scribo/core/init_integral_image.hh \ +scribo/core/internal/doc_xml_serializer.hh \ scribo/core/line_info.hh \ scribo/core/line_links.hh \ scribo/core/line_set.hh \ @@ -93,6 +98,12 @@ scribo/fun/v2b/label_to_bool.hh \ scribo/fun/v2b/objects_large_filter.hh \ scribo/fun/v2b/objects_small_filter.hh \ scribo/io/text_boxes/save.hh \ +scribo/io/xml/internal/extended_page_xml_visitor.hh \ +scribo/io/xml/internal/full_xml_visitor.hh \ +scribo/io/xml/internal/page_xml_visitor.hh \ +scribo/io/xml/internal/print_box_coords.hh \ +scribo/io/xml/internal/print_page_preambule.hh \ +scribo/io/xml/load.hh \ scribo/io/xml/save.hh \ scribo/make/all.hh \ scribo/make/debug_filename.hh \ @@ -115,7 +126,6 @@ scribo/primitive/extract/all.hh \ scribo/primitive/extract/canvas.hh \ scribo/primitive/extract/cells.hh \ scribo/primitive/extract/components.hh \ -scribo/primitive/extract/elements.hh \ scribo/primitive/extract/horizontal_separators.hh \ scribo/primitive/extract/lines_discontinued.hh \ scribo/primitive/extract/lines_h_discontinued.hh \ @@ -130,6 +140,7 @@ scribo/primitive/extract/lines_v_pattern.hh \ scribo/primitive/extract/lines_v_single.hh \ scribo/primitive/extract/lines_v_thick.hh \ scribo/primitive/extract/lines_v_thick_and_single.hh \ +scribo/primitive/extract/non_text.hh \ scribo/primitive/extract/separators.hh \ scribo/primitive/extract/separators_nonvisible.hh \ scribo/primitive/extract/vertical_separators.hh \ diff --git a/scribo/tests/unit_test/cond_tests_qt b/scribo/tests/unit_test/cond_tests_qt index 5428215..577f9e6 100644 --- a/scribo/tests/unit_test/cond_tests_qt +++ b/scribo/tests/unit_test/cond_tests_qt @@ -1 +1,2 @@ scribo/convert/from_qimage.hh +scribo/io/xml/load.hh diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 6a8f29d..71b0b5b 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -19,11 +19,15 @@ endif HAVE_MAGICKXX # Starting a conditional unit test list. if HAVE_QT check_PROGRAMS += \ -scribo_convert_from_qimage +scribo_convert_from_qimage \ +scribo_io_xml_load scribo_convert_from_qimage_CPPFLAGS= ${QT_CPPFLAGS} ${AM_CPPFLAGS} scribo_convert_from_qimage_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} scribo_convert_from_qimage_SOURCES = scribo_convert_from_qimage.cc +scribo_io_xml_load_CPPFLAGS= ${QT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_io_xml_load_LDFLAGS= ${QT_LDFLAGS} ${AM_LDFLAGS} +scribo_io_xml_load_SOURCES = scribo_io_xml_load.cc endif HAVE_QT # Starting a conditional unit test list. @@ -79,16 +83,21 @@ scribo_binarization_sauvola_ms \ scribo_binarization_sauvola_ms_split \ scribo_binarization_sauvola_threshold_image \ scribo_canvas_integral_browsing \ +scribo_convert_from_base64 \ +scribo_convert_to_base64 \ scribo_core_all \ scribo_core_central_sites \ scribo_core_component_info \ scribo_core_component_set \ scribo_core_concept_dmax_functor \ scribo_core_concept_link_functor \ +scribo_core_concept_serializable \ +scribo_core_concept_serialize_visitor \ scribo_core_def_lbl_type \ scribo_core_document \ scribo_core_erase_objects \ scribo_core_init_integral_image \ +scribo_core_internal_doc_xml_serializer \ scribo_core_line_info \ scribo_core_line_links \ scribo_core_line_set \ @@ -157,6 +166,11 @@ scribo_fun_v2b_label_to_bool \ scribo_fun_v2b_objects_large_filter \ scribo_fun_v2b_objects_small_filter \ scribo_io_text_boxes_save \ +scribo_io_xml_internal_extended_page_xml_visitor \ +scribo_io_xml_internal_full_xml_visitor \ +scribo_io_xml_internal_page_xml_visitor \ +scribo_io_xml_internal_print_box_coords \ +scribo_io_xml_internal_print_page_preambule \ scribo_io_xml_save \ scribo_make_all \ scribo_make_debug_filename \ @@ -179,7 +193,6 @@ scribo_primitive_extract_all \ scribo_primitive_extract_canvas \ scribo_primitive_extract_cells \ scribo_primitive_extract_components \ -scribo_primitive_extract_elements \ scribo_primitive_extract_horizontal_separators \ scribo_primitive_extract_lines_discontinued \ scribo_primitive_extract_lines_h_discontinued \ @@ -194,6 +207,7 @@ scribo_primitive_extract_lines_v_pattern \ scribo_primitive_extract_lines_v_single \ scribo_primitive_extract_lines_v_thick \ scribo_primitive_extract_lines_v_thick_and_single \ +scribo_primitive_extract_non_text \ scribo_primitive_extract_separators \ scribo_primitive_extract_separators_nonvisible \ scribo_primitive_extract_vertical_separators \ @@ -286,16 +300,21 @@ scribo_binarization_sauvola_ms_SOURCES = scribo_binarization_sauvola_ms.cc scribo_binarization_sauvola_ms_split_SOURCES = scribo_binarization_sauvola_ms_split.cc scribo_binarization_sauvola_threshold_image_SOURCES = scribo_binarization_sauvola_threshold_image.cc scribo_canvas_integral_browsing_SOURCES = scribo_canvas_integral_browsing.cc +scribo_convert_from_base64_SOURCES = scribo_convert_from_base64.cc +scribo_convert_to_base64_SOURCES = scribo_convert_to_base64.cc scribo_core_all_SOURCES = scribo_core_all.cc scribo_core_central_sites_SOURCES = scribo_core_central_sites.cc scribo_core_component_info_SOURCES = scribo_core_component_info.cc scribo_core_component_set_SOURCES = scribo_core_component_set.cc scribo_core_concept_dmax_functor_SOURCES = scribo_core_concept_dmax_functor.cc scribo_core_concept_link_functor_SOURCES = scribo_core_concept_link_functor.cc +scribo_core_concept_serializable_SOURCES = scribo_core_concept_serializable.cc +scribo_core_concept_serialize_visitor_SOURCES = scribo_core_concept_serialize_visitor.cc scribo_core_def_lbl_type_SOURCES = scribo_core_def_lbl_type.cc scribo_core_document_SOURCES = scribo_core_document.cc scribo_core_erase_objects_SOURCES = scribo_core_erase_objects.cc scribo_core_init_integral_image_SOURCES = scribo_core_init_integral_image.cc +scribo_core_internal_doc_xml_serializer_SOURCES = scribo_core_internal_doc_xml_serializer.cc scribo_core_line_info_SOURCES = scribo_core_line_info.cc scribo_core_line_links_SOURCES = scribo_core_line_links.cc scribo_core_line_set_SOURCES = scribo_core_line_set.cc @@ -364,6 +383,11 @@ scribo_fun_v2b_label_to_bool_SOURCES = scribo_fun_v2b_label_to_bool.cc scribo_fun_v2b_objects_large_filter_SOURCES = scribo_fun_v2b_objects_large_filter.cc scribo_fun_v2b_objects_small_filter_SOURCES = scribo_fun_v2b_objects_small_filter.cc scribo_io_text_boxes_save_SOURCES = scribo_io_text_boxes_save.cc +scribo_io_xml_internal_extended_page_xml_visitor_SOURCES = scribo_io_xml_internal_extended_page_xml_visitor.cc +scribo_io_xml_internal_full_xml_visitor_SOURCES = scribo_io_xml_internal_full_xml_visitor.cc +scribo_io_xml_internal_page_xml_visitor_SOURCES = scribo_io_xml_internal_page_xml_visitor.cc +scribo_io_xml_internal_print_box_coords_SOURCES = scribo_io_xml_internal_print_box_coords.cc +scribo_io_xml_internal_print_page_preambule_SOURCES = scribo_io_xml_internal_print_page_preambule.cc scribo_io_xml_save_SOURCES = scribo_io_xml_save.cc scribo_make_all_SOURCES = scribo_make_all.cc scribo_make_debug_filename_SOURCES = scribo_make_debug_filename.cc @@ -386,7 +410,6 @@ scribo_primitive_extract_all_SOURCES = scribo_primitive_extract_all.cc scribo_primitive_extract_canvas_SOURCES = scribo_primitive_extract_canvas.cc scribo_primitive_extract_cells_SOURCES = scribo_primitive_extract_cells.cc scribo_primitive_extract_components_SOURCES = scribo_primitive_extract_components.cc -scribo_primitive_extract_elements_SOURCES = scribo_primitive_extract_elements.cc scribo_primitive_extract_horizontal_separators_SOURCES = scribo_primitive_extract_horizontal_separators.cc scribo_primitive_extract_lines_discontinued_SOURCES = scribo_primitive_extract_lines_discontinued.cc scribo_primitive_extract_lines_h_discontinued_SOURCES = scribo_primitive_extract_lines_h_discontinued.cc @@ -401,6 +424,7 @@ scribo_primitive_extract_lines_v_pattern_SOURCES = scribo_primitive_extract_line scribo_primitive_extract_lines_v_single_SOURCES = scribo_primitive_extract_lines_v_single.cc scribo_primitive_extract_lines_v_thick_SOURCES = scribo_primitive_extract_lines_v_thick.cc scribo_primitive_extract_lines_v_thick_and_single_SOURCES = scribo_primitive_extract_lines_v_thick_and_single.cc +scribo_primitive_extract_non_text_SOURCES = scribo_primitive_extract_non_text.cc scribo_primitive_extract_separators_SOURCES = scribo_primitive_extract_separators.cc scribo_primitive_extract_separators_nonvisible_SOURCES = scribo_primitive_extract_separators_nonvisible.cc scribo_primitive_extract_vertical_separators_SOURCES = scribo_primitive_extract_vertical_separators.cc -- 1.5.6.5