From 13aeb71b453429bacd0e747334f6a8fcdc71c728 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Wed, 18 Dec 2019 11:16:08 +0100 Subject: [PATCH 1/3] Add https://github.com/qurator-spk/ocrd_repair_inconsistencies --- .gitmodules | 3 +++ Makefile | 6 ++++++ ocrd_repair_inconsistencies | 1 + 3 files changed, 10 insertions(+) create mode 160000 ocrd_repair_inconsistencies diff --git a/.gitmodules b/.gitmodules index 4c42757f..cc49b9e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,3 +67,6 @@ [submodule "sbb_textline_detector"] path = sbb_textline_detector url = https://github.com/qurator-spk/sbb_textline_detector.git +[submodule "ocrd_repair_inconsistencies"] + path = ocrd_repair_inconsistencies + url = https://github.com/qurator-spk/ocrd_repair_inconsistencies diff --git a/Makefile b/Makefile index 13c079a9..9eed8a1b 100644 --- a/Makefile +++ b/Makefile @@ -278,6 +278,12 @@ SBB_LINE_DETECTOR := $(BIN)/ocrd-sbb-line-detector $(SBB_LINE_DETECTOR): sbb_textline_detector endif +ifneq ($(findstring ocrd_repair_inconsistencies, $(OCRD_MODULES)),) +OCRD_EXECUTABLES += $(OCRD_REPAIR_INCONSISTENCIES) +OCRD_REPAIR_INCONSISTENCIES := $(BIN)/ocrd-repair-inconsistencies +$(OCRD_REPAIR_INCONSISTENCIES): ocrd_repair_inconsistencies +endif + ifneq ($(findstring workflow-configuration, $(OCRD_MODULES)),) deps-ubuntu: workflow-configuration OCRD_EXECUTABLES += $(WORKFLOW_CONFIGURATION) diff --git a/ocrd_repair_inconsistencies b/ocrd_repair_inconsistencies new file mode 160000 index 00000000..68979968 --- /dev/null +++ b/ocrd_repair_inconsistencies @@ -0,0 +1 @@ +Subproject commit 68979968104c79cbcf5490f88ed6be3248481a4b From a4201e4843c200094e5501916e5580109d9ea66b Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Wed, 18 Dec 2019 11:32:05 +0100 Subject: [PATCH 2/3] Update .gitmodules Co-Authored-By: Stefan Weil --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index cc49b9e9..8653f326 100644 --- a/.gitmodules +++ b/.gitmodules @@ -69,4 +69,4 @@ url = https://github.com/qurator-spk/sbb_textline_detector.git [submodule "ocrd_repair_inconsistencies"] path = ocrd_repair_inconsistencies - url = https://github.com/qurator-spk/ocrd_repair_inconsistencies + url = https://github.com/qurator-spk/ocrd_repair_inconsistencies.git From 271ad07cfac9e90df01e0503bc128208d9fa2882 Mon Sep 17 00:00:00 2001 From: Konstantin Baierer Date: Wed, 18 Dec 2019 11:44:26 +0100 Subject: [PATCH 3/3] Add ocrd_repair_inconsistencies to docker-{minim,medi,maxim}um --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9eed8a1b..7b43c96b 100644 --- a/Makefile +++ b/Makefile @@ -433,9 +433,9 @@ endif docker-minimum-git docker-medium-git docker-maximum-git: PIP_OPTIONS = -e # Minimum-size selection: use Ocropy binarization, use Tesseract from PPA -docker-minimum docker-minimum-git: DOCKER_MODULES = core ocrd_im6convert ocrd_cis ocrd_tesserocr tesserocr workflow-configuration +docker-minimum docker-minimum-git: DOCKER_MODULES = core ocrd_im6convert ocrd_cis ocrd_tesserocr tesserocr workflow-configuration ocrd_repair_inconsistencies # Medium-size selection: add Olena binarization and Calamari, use Tesseract from git, add evaluation -docker-medium docker-medium-git: DOCKER_MODULES = core ocrd_im6convert format-converters ocrd_cis ocrd_tesserocr tesserocr tesseract ocrd_olena ocrd_segment ocrd_keraslm ocrd_calamari dinglehopper cor-asv-ann workflow-configuration +docker-medium docker-medium-git: DOCKER_MODULES = core ocrd_im6convert format-converters ocrd_cis ocrd_tesserocr tesserocr tesseract ocrd_olena ocrd_segment ocrd_keraslm ocrd_calamari dinglehopper cor-asv-ann workflow-configuration ocrd_repair_inconsistencies # Maximum-size selection: use all modules docker-maximum docker-maximum-git: DOCKER_MODULES = $(filter-out opencv-python,$(OCRD_MODULES))