From 552caf5a056863c82572fc1fd4c646dbfd0cddb2 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthill@gmail.com>
Date: Tue, 1 Jul 2014 17:25:06 -0400
Subject: [PATCH] Updated state_identifier to use pipeline_data

---
 src/openalpr/stateidentifier.cpp | 28 ++++++++++++----------------
 src/openalpr/stateidentifier.h   |  4 ++--
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/openalpr/stateidentifier.cpp b/src/openalpr/stateidentifier.cpp
index dde5611..0a84c91 100644
--- a/src/openalpr/stateidentifier.cpp
+++ b/src/openalpr/stateidentifier.cpp
@@ -43,26 +43,18 @@ StateIdentifier::~StateIdentifier()
   delete featureMatcher;
 }
 
-int StateIdentifier::recognize(Mat img, Rect frame, char* stateCode)
-{
-  Mat croppedImage = Mat(img, frame);
 
-  return this->recognize(croppedImage, stateCode);
-}
-// Attempts to recognize the plate.  Returns a confidence level.  Updates teh "stateCode" variable
-// with the value of the country/state
-int StateIdentifier::recognize(Mat img, char* stateCode)
+// Attempts to recognize the plate.  Returns a confidence level.  Updates the region code and confidence
+// If region is found, returns true.
+bool StateIdentifier::recognize(PipelineData* pipeline_data)
 {
   timespec startTime;
   getTime(&startTime);
 
-  cvtColor(img, img, CV_BGR2GRAY);
+  Mat plateImg = Mat(pipeline_data->grayImg, pipeline_data->regionOfInterest);
 
-  resize(img, img, getSizeMaintainingAspect(img, config->stateIdImageWidthPx, config->stateIdimageHeightPx));
+  resize(plateImg, plateImg, getSizeMaintainingAspect(plateImg, config->stateIdImageWidthPx, config->stateIdimageHeightPx));
 
-  Mat plateImg(img.size(), img.type());
-  //plateImg = equalizeBrightness(img);
-  img.copyTo(plateImg);
 
   Mat debugImg(plateImg.size(), plateImg.type());
   plateImg.copyTo(debugImg);
@@ -87,7 +79,11 @@ int StateIdentifier::recognize(Mat img, char* stateCode)
   if (result.haswinner == false)
     return 0;
 
-  strcpy(stateCode, result.winner.c_str());
-
-  return result.confidence;
+  pipeline_data->region_code = result.winner;
+  pipeline_data->region_confidence = result.confidence;
+  
+  if (result.confidence >= 10)
+    return true;
+  
+  return false;
 }
diff --git a/src/openalpr/stateidentifier.h b/src/openalpr/stateidentifier.h
index e0c8c0b..3092a67 100644
--- a/src/openalpr/stateidentifier.h
+++ b/src/openalpr/stateidentifier.h
@@ -25,6 +25,7 @@
 #include "featurematcher.h"
 #include "utility.h"
 #include "config.h"
+#include "pipeline_data.h"
 
 class StateIdentifier
 {
@@ -33,8 +34,7 @@ class StateIdentifier
     StateIdentifier(Config* config);
     virtual ~StateIdentifier();
 
-    int recognize(cv::Mat img, cv::Rect frame, char* stateCode);
-    int recognize(cv::Mat img, char* stateCode);
+    bool recognize(PipelineData* pipeline_data);
 
     //int confidence;