From b6469b015e923bf7d15b5c823964d29c1b860f17 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Sat, 2 Jul 2016 10:27:26 -0400 Subject: [PATCH] Moved segmentation code to inside OCR --- src/openalpr/CMakeLists.txt | 8 ++++---- src/openalpr/alpr_impl.h | 1 - .../{ => ocr}/segmentation/charactersegmenter.cpp | 0 src/openalpr/{ => ocr}/segmentation/charactersegmenter.h | 0 src/openalpr/{ => ocr}/segmentation/histogram.cpp | 0 src/openalpr/{ => ocr}/segmentation/histogram.h | 0 .../{ => ocr}/segmentation/histogramhorizontal.cpp | 0 src/openalpr/{ => ocr}/segmentation/histogramhorizontal.h | 0 src/openalpr/{ => ocr}/segmentation/histogramvertical.cpp | 0 src/openalpr/{ => ocr}/segmentation/histogramvertical.h | 0 src/openalpr/{ => ocr}/segmentation/segment.cpp | 0 src/openalpr/{ => ocr}/segmentation/segment.h | 0 src/openalpr/{ => ocr}/segmentation/segmentationgroup.cpp | 0 src/openalpr/{ => ocr}/segmentation/segmentationgroup.h | 0 14 files changed, 4 insertions(+), 5 deletions(-) rename src/openalpr/{ => ocr}/segmentation/charactersegmenter.cpp (100%) rename src/openalpr/{ => ocr}/segmentation/charactersegmenter.h (100%) rename src/openalpr/{ => ocr}/segmentation/histogram.cpp (100%) rename src/openalpr/{ => ocr}/segmentation/histogram.h (100%) rename src/openalpr/{ => ocr}/segmentation/histogramhorizontal.cpp (100%) rename src/openalpr/{ => ocr}/segmentation/histogramhorizontal.h (100%) rename src/openalpr/{ => ocr}/segmentation/histogramvertical.cpp (100%) rename src/openalpr/{ => ocr}/segmentation/histogramvertical.h (100%) rename src/openalpr/{ => ocr}/segmentation/segment.cpp (100%) rename src/openalpr/{ => ocr}/segmentation/segment.h (100%) rename src/openalpr/{ => ocr}/segmentation/segmentationgroup.cpp (100%) rename src/openalpr/{ => ocr}/segmentation/segmentationgroup.h (100%) diff --git a/src/openalpr/CMakeLists.txt b/src/openalpr/CMakeLists.txt index 1bbc3d1..e15a2be 100644 --- a/src/openalpr/CMakeLists.txt +++ b/src/openalpr/CMakeLists.txt @@ -21,10 +21,10 @@ set(lpr_source_files postprocess/postprocess.cpp postprocess/regexrule.cpp binarize_wolf.cpp - segmentation/charactersegmenter.cpp - segmentation/histogram.cpp - segmentation/histogramvertical.cpp - segmentation/histogramhorizontal.cpp + ocr/segmentation/charactersegmenter.cpp + ocr/segmentation/histogram.cpp + ocr/segmentation/histogramvertical.cpp + ocr/segmentation/histogramhorizontal.cpp edges/edgefinder.cpp edges/platecorners.cpp edges/platelines.cpp diff --git a/src/openalpr/alpr_impl.h b/src/openalpr/alpr_impl.h index e3ffe7b..d098933 100644 --- a/src/openalpr/alpr_impl.h +++ b/src/openalpr/alpr_impl.h @@ -36,7 +36,6 @@ #include "licenseplatecandidate.h" #include "../statedetection/state_detector.h" -#include "segmentation/charactersegmenter.h" #include "ocr/ocr.h" #include "ocr/ocrfactory.h" diff --git a/src/openalpr/segmentation/charactersegmenter.cpp b/src/openalpr/ocr/segmentation/charactersegmenter.cpp similarity index 100% rename from src/openalpr/segmentation/charactersegmenter.cpp rename to src/openalpr/ocr/segmentation/charactersegmenter.cpp diff --git a/src/openalpr/segmentation/charactersegmenter.h b/src/openalpr/ocr/segmentation/charactersegmenter.h similarity index 100% rename from src/openalpr/segmentation/charactersegmenter.h rename to src/openalpr/ocr/segmentation/charactersegmenter.h diff --git a/src/openalpr/segmentation/histogram.cpp b/src/openalpr/ocr/segmentation/histogram.cpp similarity index 100% rename from src/openalpr/segmentation/histogram.cpp rename to src/openalpr/ocr/segmentation/histogram.cpp diff --git a/src/openalpr/segmentation/histogram.h b/src/openalpr/ocr/segmentation/histogram.h similarity index 100% rename from src/openalpr/segmentation/histogram.h rename to src/openalpr/ocr/segmentation/histogram.h diff --git a/src/openalpr/segmentation/histogramhorizontal.cpp b/src/openalpr/ocr/segmentation/histogramhorizontal.cpp similarity index 100% rename from src/openalpr/segmentation/histogramhorizontal.cpp rename to src/openalpr/ocr/segmentation/histogramhorizontal.cpp diff --git a/src/openalpr/segmentation/histogramhorizontal.h b/src/openalpr/ocr/segmentation/histogramhorizontal.h similarity index 100% rename from src/openalpr/segmentation/histogramhorizontal.h rename to src/openalpr/ocr/segmentation/histogramhorizontal.h diff --git a/src/openalpr/segmentation/histogramvertical.cpp b/src/openalpr/ocr/segmentation/histogramvertical.cpp similarity index 100% rename from src/openalpr/segmentation/histogramvertical.cpp rename to src/openalpr/ocr/segmentation/histogramvertical.cpp diff --git a/src/openalpr/segmentation/histogramvertical.h b/src/openalpr/ocr/segmentation/histogramvertical.h similarity index 100% rename from src/openalpr/segmentation/histogramvertical.h rename to src/openalpr/ocr/segmentation/histogramvertical.h diff --git a/src/openalpr/segmentation/segment.cpp b/src/openalpr/ocr/segmentation/segment.cpp similarity index 100% rename from src/openalpr/segmentation/segment.cpp rename to src/openalpr/ocr/segmentation/segment.cpp diff --git a/src/openalpr/segmentation/segment.h b/src/openalpr/ocr/segmentation/segment.h similarity index 100% rename from src/openalpr/segmentation/segment.h rename to src/openalpr/ocr/segmentation/segment.h diff --git a/src/openalpr/segmentation/segmentationgroup.cpp b/src/openalpr/ocr/segmentation/segmentationgroup.cpp similarity index 100% rename from src/openalpr/segmentation/segmentationgroup.cpp rename to src/openalpr/ocr/segmentation/segmentationgroup.cpp diff --git a/src/openalpr/segmentation/segmentationgroup.h b/src/openalpr/ocr/segmentation/segmentationgroup.h similarity index 100% rename from src/openalpr/segmentation/segmentationgroup.h rename to src/openalpr/ocr/segmentation/segmentationgroup.h