From 5eaa67749b307a8ec4335509cef52a6f84e1ad38 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Sun, 3 Jul 2016 16:08:06 -0400 Subject: [PATCH] Separated the "segment" function call --- src/openalpr/ocr/segmentation/charactersegmenter.cpp | 11 +++++++++-- src/openalpr/ocr/segmentation/charactersegmenter.h | 2 ++ src/openalpr/ocr/tesseract_ocr.cpp | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/openalpr/ocr/segmentation/charactersegmenter.cpp b/src/openalpr/ocr/segmentation/charactersegmenter.cpp index fc29e7b..8a34794 100644 --- a/src/openalpr/ocr/segmentation/charactersegmenter.cpp +++ b/src/openalpr/ocr/segmentation/charactersegmenter.cpp @@ -39,8 +39,6 @@ namespace alpr //CharacterRegion charRegion(img, debug); - timespec startTime; - getTimeMonotonic(&startTime); if (pipeline_data->plate_inverted) bitwise_not(pipeline_data->crop_gray, pipeline_data->crop_gray); @@ -54,6 +52,13 @@ namespace alpr cout << "Segmenter: inverted: " << pipeline_data->plate_inverted << endl; + } + + void CharacterSegmenter::segment() { + + timespec startTime; + getTimeMonotonic(&startTime); + if (this->config->debugCharSegmenter) { displayImage(config, "CharacterSegmenter Thresholds", drawImageDashboard(pipeline_data->thresholds, CV_8U, 3)); @@ -209,6 +214,8 @@ namespace alpr } } + + CharacterSegmenter::~CharacterSegmenter() { diff --git a/src/openalpr/ocr/segmentation/charactersegmenter.h b/src/openalpr/ocr/segmentation/charactersegmenter.h index 51b8aee..82bfe2e 100644 --- a/src/openalpr/ocr/segmentation/charactersegmenter.h +++ b/src/openalpr/ocr/segmentation/charactersegmenter.h @@ -48,6 +48,8 @@ namespace alpr CharacterSegmenter(PipelineData* pipeline_data); virtual ~CharacterSegmenter(); + void segment(); + int confidence; diff --git a/src/openalpr/ocr/tesseract_ocr.cpp b/src/openalpr/ocr/tesseract_ocr.cpp index 55eeaf6..2217ff5 100644 --- a/src/openalpr/ocr/tesseract_ocr.cpp +++ b/src/openalpr/ocr/tesseract_ocr.cpp @@ -155,6 +155,7 @@ namespace alpr void TesseractOcr::segment(PipelineData* pipeline_data) { CharacterSegmenter segmenter(pipeline_data); + segmenter.segment(); }